diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index 25004db5..eeef5047 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -22,7 +22,7 @@ core_plugin =  {{ core_plugin }}
 api_paste_config = /etc/neutron/api-paste.ini
 auth_strategy = keystone
 {% if notifications == 'True' -%}
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 {% endif -%}
 default_notification_level = INFO
 notification_topics = notifications
diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf
index 19e3af9d..39cbfa55 100644
--- a/templates/kilo/neutron.conf
+++ b/templates/kilo/neutron.conf
@@ -22,7 +22,7 @@ core_plugin =  {{ core_plugin }}
 
 api_paste_config = /etc/neutron/api-paste.ini
 auth_strategy = keystone
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
+notification_driver = messaging
 default_notification_level = INFO
 notification_topics = notifications