diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
index 0b4ed9d6..b8e1342d 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -109,8 +109,6 @@ instances_path = {{ instances_path }}
 {% endif -%}
 
 {% if enable_designate -%}
-notification_driver = {{ notification_driver }}
-notification_topics = {{ notification_topics }}
 notify_on_state_change = {{ notify_on_state_change }}
 {% endif -%}
 
@@ -224,6 +222,8 @@ pool = {{ storage_pool }}
 
 {% include "section-rabbitmq-oslo" %}
 
+{% include "section-oslo-notifications" %}
+
 {% include "parts/section-cinder" %}
 
 [oslo_concurrency]
diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf
index 8398b74c..c91ba2b2 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -109,8 +109,6 @@ instances_path = {{ instances_path }}
 {% endif -%}
 
 {% if enable_designate -%}
-notification_driver = {{ notification_driver }}
-notification_topics = {{ notification_topics }}
 notify_on_state_change = {{ notify_on_state_change }}
 {% endif -%}
 
@@ -224,6 +222,8 @@ pool = {{ storage_pool }}
 
 {% include "section-rabbitmq-oslo" %}
 
+{% include "section-oslo-notifications" %}
+
 {% include "parts/section-cinder" %}
 
 [oslo_concurrency]