diff --git a/files/dash_settings.py b/files/dash_settings.py
index 4a49a8d..10a3295 100644
--- a/files/dash_settings.py
+++ b/files/dash_settings.py
@@ -47,7 +47,7 @@ MAILER_EMAIL_BACKEND = EMAIL_BACKEND
 
 # FIXME: This needs to be changed to allow for multi-node setup.
 OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0/"
-OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:5001/v2.0"
+OPENSTACK_KEYSTONE_ADMIN_URL = "http://localhost:35357/v2.0"
 OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
 
 # NOTE(tres): Available services should come from the service
diff --git a/files/glance-api.conf b/files/glance-api.conf
index 88db79a..d386c95 100644
--- a/files/glance-api.conf
+++ b/files/glance-api.conf
@@ -172,7 +172,7 @@ service_protocol = http
 service_host = 127.0.0.1
 service_port = 5000
 auth_host = 127.0.0.1
-auth_port = 5001
+auth_port = 35357
 auth_protocol = http
 auth_uri = http://127.0.0.1:5000/
 admin_token = 999888777666
diff --git a/files/glance-registry.conf b/files/glance-registry.conf
index 75b21f7..5bbc6c0 100644
--- a/files/glance-registry.conf
+++ b/files/glance-registry.conf
@@ -61,7 +61,7 @@ service_protocol = http
 service_host = 127.0.0.1
 service_port = 5000
 auth_host = 127.0.0.1
-auth_port = 5001
+auth_port = 35357
 auth_protocol = http
 auth_uri = http://127.0.0.1:5000/
 admin_token = 999888777666
diff --git a/files/keystone.conf b/files/keystone.conf
index cd785a7..687273b 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -36,7 +36,7 @@ service_port = 5000
 admin_host = 0.0.0.0
 
 # Port the bind the Admin API server to
-admin_port = 5001
+admin_port = 35357
 
 #Role that allows to perform admin operations.
 keystone-admin-role = KeystoneAdmin
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index d1be32d..e6f384f 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -30,7 +30,7 @@ $BIN_DIR/keystone-manage $* service add keystone identity "Keystone Identity Ser
 #endpointTemplates
 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne nova http://%HOST_IP%:8774/v1.1/%tenant_id% http://%HOST_IP%:8774/v1.1/%tenant_id%  http://%HOST_IP%:8774/v1.1/%tenant_id% 1 1
 $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne glance http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% http://%HOST_IP%:9292/v1.1/%tenant_id% 1 1
-$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:5001/v2.0 http://%HOST_IP%:5000/v2.0 1 1
+$BIN_DIR/keystone-manage $* endpointTemplates add RegionOne keystone http://%HOST_IP%:5000/v2.0 http://%HOST_IP%:35357/v2.0 http://%HOST_IP%:5000/v2.0 1 1
 # $BIN_DIR/keystone-manage $* endpointTemplates add RegionOne swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1
 
 # Tokens