diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py
index 2f2bea9f..032dbc00 100644
--- a/hooks/nova_compute_utils.py
+++ b/hooks/nova_compute_utils.py
@@ -556,7 +556,7 @@ def do_openstack_upgrade(configs):
     apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
     apt_install(determine_packages(), fatal=True)
 
-    # Regenerate configs in full for new release
+    configs.set_release(openstack_release=new_os_rel)
     configs.write_all()
     [service_restart(s) for s in services()]
 
diff --git a/templates/juno/nova.conf b/templates/juno/nova.conf
index f1725f32..5248fa68 100644
--- a/templates/juno/nova.conf
+++ b/templates/juno/nova.conf
@@ -1,4 +1,4 @@
-# havana
+# juno
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.