diff --git a/recipes/cinder-common.rb b/recipes/cinder-common.rb
index 09c50c4..3e40703 100644
--- a/recipes/cinder-common.rb
+++ b/recipes/cinder-common.rb
@@ -48,12 +48,12 @@ end
 glance_api_endpoint = internal_endpoint 'image_api'
 cinder_api_bind = node['openstack']['bind_service']['all']['block-storage']
 cinder_api_bind_address = bind_address cinder_api_bind
-identity_endpoint = public_endpoint 'identity'
+identity_endpoint = internal_endpoint 'identity'
 node.default['openstack']['block-storage']['conf_secrets']
   .[]('keystone_authtoken')['password'] =
   get_password 'service', 'openstack-block-storage'
 
-auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
+auth_url = ::URI.decode identity_endpoint.to_s
 
 directory '/etc/cinder' do
   group node['openstack']['block-storage']['group']
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 4eb8a66..f64b151 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('block-storage') },