diff --git a/hooks/nova_compute_hooks.py b/hooks/nova_compute_hooks.py
index 2eb5702f..07efef49 100755
--- a/hooks/nova_compute_hooks.py
+++ b/hooks/nova_compute_hooks.py
@@ -121,8 +121,6 @@ def config_changed():
         if openstack_upgrade_available('nova-common'):
             status_set('maintenance', 'Running openstack upgrade')
             do_openstack_upgrade(CONFIGS)
-            # Refresh configs templates as os release has changed
-            CONFIGS = register_configs()
 
     sysctl_dict = config('sysctl')
     if sysctl_dict:
diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py
index 8bf6ad96..032dbc00 100644
--- a/hooks/nova_compute_utils.py
+++ b/hooks/nova_compute_utils.py
@@ -556,9 +556,8 @@ 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
-    new_configs = register_configs()
-    new_configs.write_all()
+    configs.set_release(openstack_release=new_os_rel)
+    configs.write_all()
     [service_restart(s) for s in services()]