diff --git a/hooks/neutron_utils.py b/hooks/neutron_utils.py
index f4f6a0d0..25cc5069 100644
--- a/hooks/neutron_utils.py
+++ b/hooks/neutron_utils.py
@@ -747,6 +747,7 @@ def do_openstack_upgrade(configs):
                 fatal=True, dist=True)
     apt_install(get_early_packages(), fatal=True)
     apt_install(get_packages(), fatal=True)
+    configs.set_release(openstack_release=new_os_rel)
     configs.write_all()
 
 
diff --git a/templates/juno/ml2_conf.ini b/templates/juno/ml2_conf.ini
index adf8f6c8..1213f9ea 100644
--- a/templates/juno/ml2_conf.ini
+++ b/templates/juno/ml2_conf.ini
@@ -1,6 +1,6 @@
 ###############################################################################
 # [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
+# Configuration file maintained by Juju. Local changes may be overwritten. Juno
 ###############################################################################
 [ml2]
 type_drivers = gre,vxlan,vlan,flat