diff --git a/packstack/puppet/templates/neutron_notifications.pp b/packstack/puppet/templates/neutron_notifications.pp
index 810042531..7954ac3a6 100644
--- a/packstack/puppet/templates/neutron_notifications.pp
+++ b/packstack/puppet/templates/neutron_notifications.pp
@@ -2,10 +2,10 @@ $neutron_notif_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
 
 # Configure nova notifications system
 class { '::neutron::server::notifications':
-  nova_admin_username    => 'nova',
-  nova_admin_password    => hiera('CONFIG_NOVA_KS_PW'),
-  nova_admin_tenant_name => 'services',
-  nova_url               => "http://${neutron_notif_cfg_ctrl_host}:8774/v2",
-  nova_admin_auth_url    => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
-  nova_region_name       => hiera('CONFIG_KEYSTONE_REGION'),
+  username    => 'nova',
+  password    => hiera('CONFIG_NOVA_KS_PW'),
+  tenant_name => 'services',
+  nova_url    => "http://${neutron_notif_cfg_ctrl_host}:8774/v2",
+  auth_url    => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
+  region_name => hiera('CONFIG_KEYSTONE_REGION'),
 }