diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 3be9ae3cc7..7f1ade48fb 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -7,8 +7,8 @@ RUN yum -y install openstack-keystone \
         ; yum clean all
 
 # Add start-up and check scripts
-ADD ./start.sh /opt/kolla/start.sh
-ADD ./check.sh /opt/kolla/check.sh
+ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
 
 # Run the Keystone start script
-CMD ["/opt/kolla/start.sh"]
+CMD ["/start.sh"]
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index 829caf6e9e..2f6d902d6b 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -106,8 +106,8 @@ crudini --set $cfg \
 
 # Setup the openrc auth file
 cat > /openrc <<EOF
-export OS_AUTH_URL=http://"${KEYSTONE_PUBLIC_SERVICE_HOST}":"${KEYSTONE_PUBLIC_SERVICE_PORT}/v"${KEYSTONE_API_VERSION}"
-export OS_USERNAME=admin
+export OS_AUTH_URL=http://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v${KEYSTONE_API_VERSION}
+export OS_USERNAME=${KEYSTONE_USER}
 export OS_PASSWORD=${KEYSTONE_ADMIN_PASSWORD}
 export OS_TENANT_NAME=${ADMIN_TENANT_NAME}
 EOF