diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
index b494dbfbf..17bead7c1 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
@@ -12,11 +12,16 @@ class packstack::neutron::api ()
     $neutron_vpnaas_enabled  = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
     $neutron_lbaas_enabled   = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
 
+    class { '::neutron::keystone::authtoken':
+      username     => 'neutron',
+      password     => $neutron_user_password,
+      auth_uri     => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
+      auth_url     => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
+      project_name => 'services',
+    }
+
     class { '::neutron::server':
       database_connection   => $neutron_sql_connection,
-      password              => $neutron_user_password,
-      auth_uri              => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
-      auth_url              => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       sync_db               => true,
       enabled               => true,
       api_workers           => hiera('CONFIG_SERVICE_WORKERS'),
diff --git a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
index 24bb42d41..fb77e0f30 100644
--- a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
@@ -6,18 +6,20 @@ class packstack::provision::bridge ()
     $provision_tempest_br    = str2bool(hiera('CONFIG_PROVISION_TEMPEST'))
     $provision_demo_br       = str2bool(hiera('CONFIG_PROVISION_DEMO'))
 
+    $neutron_user_password   = hiera('CONFIG_NEUTRON_KS_PW')
+
     if $provision_demo_br {
       $floating_range_br = hiera('CONFIG_PROVISION_DEMO_FLOATRANGE')
     } elsif $provision_tempest_br {
       $floating_range_br = hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE')
     }
 
-    neutron_config {
-      'keystone_authtoken/identity_uri':      value => hiera('CONFIG_KEYSTONE_ADMIN_URL');
-      'keystone_authtoken/auth_uri':          value => hiera('CONFIG_KEYSTONE_PUBLIC_URL');
-      'keystone_authtoken/admin_tenant_name': value => 'services';
-      'keystone_authtoken/admin_user':        value => 'neutron';
-      'keystone_authtoken/admin_password':    value => hiera('CONFIG_NEUTRON_KS_PW');
+    class { '::neutron::keystone::authtoken':
+      username     => 'neutron',
+      password     => $neutron_user_password,
+      auth_uri     => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
+      auth_url     => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
+      project_name => 'services',
     }
 
     if $provision_neutron_br and $setup_ovs_bridge {