diff --git a/oslo_templates/files/queens/oslo/messaging/_notifications.conf b/oslo_templates/files/queens/oslo/messaging/_notifications.conf
index 67c6222..8a86cbf 100644
--- a/oslo_templates/files/queens/oslo/messaging/_notifications.conf
+++ b/oslo_templates/files/queens/oslo/messaging/_notifications.conf
@@ -7,6 +7,7 @@
 # messaging, messagingv2, routing, log, test, noop (multi valued)
 # Deprecated group/name - [DEFAULT]/notification_driver
 #driver =
+driver = {{ _data.get('driver', 'messagingv2') }}
 
 # A URL representing the messaging driver to use for notifications. If
 # not set, we fall back to the same configuration used for RPC.
@@ -18,18 +19,11 @@
 # Deprecated group/name - [rpc_notifier2]/topics
 # Deprecated group/name - [DEFAULT]/notification_topics
 #topics = notifications
+{%- if _data.topics is defined %}
+topics = {{ _data.topics }}
+{%- endif %}
 
 # The maximum number of attempts to re-send a notification message
 # which failed to be delivered due to a recoverable error. 0 - No
 # retry, -1 - indefinite (integer value)
 #retry = -1
-
-{%- if _data is mapping %}
-driver = {{ _data.get('driver', 'messagingv2') }}
-{%- if _data.topics is defined %}
-topics = {{ _data.topics }}
-{%- endif %}
-{%- elif _data %}
-driver=messagingv2
-{%- endif %}
-