diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2
index ab050a97..f62e8735 100644
--- a/templates/glance-api.conf.j2
+++ b/templates/glance-api.conf.j2
@@ -23,10 +23,6 @@ enable_v1_registry = {{ glance_enable_v1_registry }}
 enable_v2_api = {{ glance_enable_v2_api }}
 enable_v2_registry = {{ glance_enable_v2_registry }}
 
-{% if glance_ceilometer_enabled %}
-notification_driver = messagingv2
-{% endif %}
-
 rpc_backend = {{ glance_rpc_backend }}
 
 delayed_delete = False
@@ -36,6 +32,11 @@ image_cache_dir = {{ glance_system_user_home }}/cache/
 # defaults to true if RBD is used as default store
 show_image_direct_url = {{ glance_show_image_direct_url }}
 
+{% if glance_ceilometer_enabled %}
+[oslo_messaging_notifications]
+driver = messagingv2
+{% endif %}
+
 [task]
 task_executor = {{ glance_task_executor }}
 
diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2
index e78712d2..30b0790c 100644
--- a/templates/glance-registry.conf.j2
+++ b/templates/glance-registry.conf.j2
@@ -14,11 +14,13 @@ backlog = 4096
 workers = {{ glance_registry_workers | default(api_threads) }}
 api_limit_max = 1000
 limit_param_default = 25
-{% if glance_ceilometer_enabled %}
-notification_driver = messagingv2
-{% endif %}
 rpc_backend = {{ glance_rpc_backend }}
 
+{% if glance_ceilometer_enabled %}
+[oslo_messaging_notifications]
+driver = messagingv2
+{% endif %}
+
 [database]
 connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_password }}@{{ glance_galera_address }}/{{ glance_galera_database }}?charset=utf8