diff --git a/recipes/default.rb b/recipes/default.rb
index 3e19cd78..7e0e527b 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -86,8 +86,8 @@ if node['openstack']['mq']['service_type'] == 'rabbit'
   node.default['openstack']['network']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'network'
 end
 
-identity_endpoint = public_endpoint 'identity'
-auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
+identity_endpoint = internal_endpoint 'identity'
+auth_url = ::URI.decode identity_endpoint.to_s
 
 db_user = node['openstack']['db']['network']['username']
 db_pass = get_password 'db', 'neutron'
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 17c5349f..437edd5e 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -26,8 +26,8 @@ class ::Chef::Recipe
   include ::Openstack
 end
 
-identity_endpoint = public_endpoint 'identity'
-auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
+identity_endpoint = internal_endpoint 'identity'
+auth_url = ::URI.decode identity_endpoint.to_s
 
 interfaces = {
   public: { url: public_endpoint('network') },