diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index dcc09871..f5260846 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -14,7 +14,7 @@ bind_host = {{ bind_host }}
 auth_strategy = keystone
 
 {% if notifications == 'True' -%}
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 {% endif -%}
 api_workers = {{ workers }}
 rpc_workers = {{ workers }}
diff --git a/templates/juno/neutron.conf b/templates/juno/neutron.conf
index 19dd106a..aecd44ee 100644
--- a/templates/juno/neutron.conf
+++ b/templates/juno/neutron.conf
@@ -11,7 +11,7 @@ state_path = /var/lib/neutron
 lock_path = $state_path/lock
 bind_host = {{ bind_host }}
 auth_strategy = keystone
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 api_workers = {{ workers }}
 rpc_workers = {{ workers }}
 
diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf
index 89358d79..6b51f5fb 100644
--- a/templates/kilo/neutron.conf
+++ b/templates/kilo/neutron.conf
@@ -11,7 +11,7 @@ use_syslog = {{ use_syslog }}
 state_path = /var/lib/neutron
 bind_host = {{ bind_host }}
 auth_strategy = keystone
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 api_workers = {{ workers }}
 rpc_workers = {{ workers }}
 
diff --git a/templates/liberty/neutron.conf b/templates/liberty/neutron.conf
index f01dc527..621527c6 100644
--- a/templates/liberty/neutron.conf
+++ b/templates/liberty/neutron.conf
@@ -11,7 +11,7 @@ use_syslog = {{ use_syslog }}
 state_path = /var/lib/neutron
 bind_host = {{ bind_host }}
 auth_strategy = keystone
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 notification_topics = notifications,notifications_designate
 api_workers = {{ workers }}
 rpc_workers = {{ workers }}
diff --git a/templates/mitaka/neutron.conf b/templates/mitaka/neutron.conf
index 79d8fc26..3a003a22 100644
--- a/templates/mitaka/neutron.conf
+++ b/templates/mitaka/neutron.conf
@@ -11,7 +11,7 @@ use_syslog = {{ use_syslog }}
 state_path = /var/lib/neutron
 bind_host = {{ bind_host }}
 auth_strategy = keystone
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 notification_topics = notifications,notifications_designate
 api_workers = {{ workers }}
 rpc_workers = {{ workers }}
diff --git a/templates/newton/neutron.conf b/templates/newton/neutron.conf
index 010ba6eb..327127a0 100644
--- a/templates/newton/neutron.conf
+++ b/templates/newton/neutron.conf
@@ -11,7 +11,7 @@ use_syslog = {{ use_syslog }}
 state_path = /var/lib/neutron
 bind_host = {{ bind_host }}
 auth_strategy = keystone
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 notification_topics = notifications,notifications_designate
 api_workers = {{ workers }}
 rpc_workers = {{ workers }}