diff --git a/playbooks/roles/os_cinder/templates/cinder.conf.j2 b/playbooks/roles/os_cinder/templates/cinder.conf.j2
index a535cf8654..ac24316246 100644
--- a/playbooks/roles/os_cinder/templates/cinder.conf.j2
+++ b/playbooks/roles/os_cinder/templates/cinder.conf.j2
@@ -90,8 +90,8 @@ connection = mysql://{{ cinder_galera_user }}:{{ cinder_container_mysql_password
 
 [keystone_authtoken]
 signing_dir = /var/cache/cinder
-identity_uri = {{ keystone_service_internaluri }}
-auth_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ cinder_service_tenant_name }}
 admin_user = {{ cinder_service_user_name }}
 admin_password = {{ cinder_service_password }}
diff --git a/playbooks/roles/os_glance/templates/glance-api.conf.j2 b/playbooks/roles/os_glance/templates/glance-api.conf.j2
index 28a5ebaaaf..7937a2746e 100644
--- a/playbooks/roles/os_glance/templates/glance-api.conf.j2
+++ b/playbooks/roles/os_glance/templates/glance-api.conf.j2
@@ -42,8 +42,8 @@ connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password
 
 [keystone_authtoken]
 signing_dir = {{ glance_system_user_home }}/cache/api
-identity_uri = {{ keystone_service_internaluri }}
-auth_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ glance_service_tenant_name }}
 admin_user = {{ glance_service_user_name }}
 admin_password = {{ glance_service_password }}
diff --git a/playbooks/roles/os_glance/templates/glance-cache.conf.j2 b/playbooks/roles/os_glance/templates/glance-cache.conf.j2
index d5f38ea6e2..0f6e54c18b 100644
--- a/playbooks/roles/os_glance/templates/glance-cache.conf.j2
+++ b/playbooks/roles/os_glance/templates/glance-cache.conf.j2
@@ -12,5 +12,5 @@ image_cache_stall_time = 86400
 image_cache_max_size = {{ glance_image_cache_max_size }}
 registry_host = {{ glance_registry_host }}
 registry_port = 9191
-auth_url = {{ keystone_service_internaluri }}
+auth_url = {{ keystone_service_internalurl }}
 filesystem_store_datadir = {{ glance_system_user_home }}/images/
diff --git a/playbooks/roles/os_glance/templates/glance-registry.conf.j2 b/playbooks/roles/os_glance/templates/glance-registry.conf.j2
index f89e35f7a0..f09b335e73 100644
--- a/playbooks/roles/os_glance/templates/glance-registry.conf.j2
+++ b/playbooks/roles/os_glance/templates/glance-registry.conf.j2
@@ -20,8 +20,8 @@ connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password
 
 [keystone_authtoken]
 signing_dir = {{ glance_system_user_home }}/cache/registry/
-identity_uri = {{ keystone_service_internaluri }}
-auth_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ glance_service_tenant_name }}
 admin_user = {{ glance_service_user_name }}
 admin_password = {{ glance_service_password }}
diff --git a/playbooks/roles/os_heat/templates/heat.conf.j2 b/playbooks/roles/os_heat/templates/heat.conf.j2
index 7b6317c256..a685b3a2e7 100644
--- a/playbooks/roles/os_heat/templates/heat.conf.j2
+++ b/playbooks/roles/os_heat/templates/heat.conf.j2
@@ -64,7 +64,7 @@ endpoint_type = {{ heat_client_endpoint }}
 connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ galera_address }}/{{ heat_galera_database }}?charset=utf8
 
 [ec2authtoken]
-auth_uri = {{ keystone_service_internaluri }}
+auth_uri = {{ keystone_service_internalurl }}
 
 [heat_api]
 bind_port = {{ heat_service_port }}
@@ -77,8 +77,8 @@ bind_port = {{ heat_watch_port }}
 
 [keystone_authtoken]
 signing_dir = /var/cache/heat
-identity_uri = {{ keystone_service_internaluri }}
-auth_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ heat_service_tenant_name }}
 admin_user = {{ heat_service_user_name }}
 admin_password = {{ heat_service_password }}
diff --git a/playbooks/roles/os_neutron/templates/neutron.conf.j2 b/playbooks/roles/os_neutron/templates/neutron.conf.j2
index 84279f1a7d..6924d4937d 100644
--- a/playbooks/roles/os_neutron/templates/neutron.conf.j2
+++ b/playbooks/roles/os_neutron/templates/neutron.conf.j2
@@ -97,7 +97,7 @@ root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 
 [keystone_authtoken]
 signing_dir = /var/cache/neutron
-identity_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
 auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ neutron_service_tenant_name }}
 admin_user = {{ neutron_service_user_name }}
diff --git a/playbooks/roles/os_nova/templates/nova.conf.j2 b/playbooks/roles/os_nova/templates/nova.conf.j2
index 8be5040ee6..4faaabd1e0 100644
--- a/playbooks/roles/os_nova/templates/nova.conf.j2
+++ b/playbooks/roles/os_nova/templates/nova.conf.j2
@@ -149,8 +149,8 @@ enabled = True
 
 [keystone_authtoken]
 signing_dir = {{ nova_system_home_folder }}/cache/api
-identity_uri = {{ keystone_service_internaluri }}
-auth_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ nova_service_tenant_name }}
 admin_user = {{ nova_service_user_name }}
 admin_password = {{ nova_service_password }}
diff --git a/playbooks/roles/os_swift/templates/proxy-server.conf.j2 b/playbooks/roles/os_swift/templates/proxy-server.conf.j2
index 9fd3a614b6..9a47dc6a15 100644
--- a/playbooks/roles/os_swift/templates/proxy-server.conf.j2
+++ b/playbooks/roles/os_swift/templates/proxy-server.conf.j2
@@ -35,8 +35,8 @@ user_test_tester3 = testing3
 {% elif swift_authtoken_active %}
 [filter:authtoken]
 paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-identity_uri = {{ keystone_service_internaluri }}
-auth_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ swift_service_tenant_name }}
 admin_user = {{ swift_service_user_name }}
 admin_password = {{ swift_service_password }}