diff --git a/heat/files/liberty/heat.conf.Debian b/heat/files/liberty/heat.conf.Debian
index 3454950..a677bab 100644
--- a/heat/files/liberty/heat.conf.Debian
+++ b/heat/files/liberty/heat.conf.Debian
@@ -172,7 +172,9 @@
 
 # Driver or drivers to handle sending notifications. (multi valued)
 #notification_driver =
-notification_driver = oslo.messaging.notifier.Notifier
+{%- if server.notification %}
+notification_driver = messagingv2
+{% endif %}
 
 # AMQP topic used for OpenStack notifications. (list value)
 # Deprecated group/name - [rpc_notifier2]/topics
diff --git a/heat/files/mitaka/heat.conf.Debian b/heat/files/mitaka/heat.conf.Debian
index 7142747..08a8558 100644
--- a/heat/files/mitaka/heat.conf.Debian
+++ b/heat/files/mitaka/heat.conf.Debian
@@ -172,7 +172,9 @@
 
 # Driver or drivers to handle sending notifications. (multi valued)
 #notification_driver =
-notification_driver = oslo.messaging.notifier.Notifier
+{%- if server.notification %}
+notification_driver = messagingv2
+{%- endif %}
 
 # AMQP topic used for OpenStack notifications. (list value)
 # Deprecated group/name - [rpc_notifier2]/topics