diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 3d9157f..66ad5e1 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -86,11 +86,9 @@
 auth_protocol=http
 admin_user=cinder
 signing_dirname=/tmp/keystone-signing-cinder
-auth_uri=http://{{ controller.identity.host }}:{{ controller.identity.port }}
+auth_uri=http://{{ controller.identity.host }}:5000
 auth_url = http://{{ controller.identity.host }}:35357
 auth_plugin = password
-project_domain_id = default
-user_domain_id = default
 
 [database]
 idle_timeout=3600
diff --git a/cinder/files/liberty/cinder.conf.volume.Debian b/cinder/files/liberty/cinder.conf.volume.Debian
index 9db87b3..c58e757 100644
--- a/cinder/files/liberty/cinder.conf.volume.Debian
+++ b/cinder/files/liberty/cinder.conf.volume.Debian
@@ -95,11 +95,9 @@
 auth_protocol=http
 admin_user=cinder
 signing_dirname=/tmp/keystone-signing-cinder
-auth_uri=http://{{ volume.identity.host }}:{{ volume.identity.port }}
+auth_uri=http://{{ volume.identity.host }}:5000
 auth_url = http://{{ volume.identity.host }}:35357
 auth_plugin = password
-project_domain_id = default
-user_domain_id = default
 
 [database]
 idle_timeout=3600