diff --git a/packstack/puppet/templates/nova_neutron.pp b/packstack/puppet/templates/nova_neutron.pp
index 278591dde..ccf08dbe1 100644
--- a/packstack/puppet/templates/nova_neutron.pp
+++ b/packstack/puppet/templates/nova_neutron.pp
@@ -1,11 +1,12 @@
 $nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
+$neutron_auth_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
 
 class { '::nova::network::neutron':
   neutron_password    => hiera('CONFIG_NEUTRON_KS_PW'),
-  neutron_auth_plugin => 'password',
+  neutron_auth_plugin => 'v3password',
   neutron_url         => "http://${nova_neutron_cfg_ctrl_host}:9696",
-  neutron_tenant_name => 'services',
-  neutron_auth_url    => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
+  neutron_project_name => 'services',
+  neutron_auth_url    => "${neutron_auth_url}/v3",
   neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
 }