diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
index f99d43ca9..538a619ff 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
@@ -15,7 +15,7 @@ class packstack::neutron::api ()
     class { '::neutron::keystone::authtoken':
       username     => 'neutron',
       password     => $neutron_user_password,
-      auth_uri     => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
+      auth_uri     => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       auth_url     => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       project_name => 'services',
     }
diff --git a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
index fb77e0f30..59fb2d453 100644
--- a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
@@ -17,7 +17,7 @@ class packstack::provision::bridge ()
     class { '::neutron::keystone::authtoken':
       username     => 'neutron',
       password     => $neutron_user_password,
-      auth_uri     => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
+      auth_uri     => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       auth_url     => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       project_name => 'services',
     }