diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile
index dcc1b47dbb..13c5b5684b 100644
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@@ -2,4 +2,6 @@ FROM kollaglue/fedora-rdo-glance-base
 MAINTAINER Dan Radez <dradez@redhat.com>
 
 ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
+
 CMD ["/start.sh"]
diff --git a/docker/glance/glance-api/check.sh b/docker/glance/glance-api/check.sh
new file mode 100755
index 0000000000..63c2654645
--- /dev/null
+++ b/docker/glance/glance-api/check.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+RES=0
+
+. /openrc
+if ! keystone token-get > /dev/null; then
+    echo "ERROR: keystone token-get failed" >&2
+    RES=1
+else
+    if ! glance image-list > /dev/null; then
+        echo "ERROR: glance image-list failed" >&2
+        RES=1
+    fi
+fi
+
+exit $RES
+
diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh
index 2868d31c0b..b260ed7e93 100644
--- a/docker/glance/glance-base/config-glance.sh
+++ b/docker/glance/glance-base/config-glance.sh
@@ -55,9 +55,10 @@ for cfg in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do
         "mysql://${GLANCE_DB_USER}:${GLANCE_DB_PASSWORD}@${MARIADB_SERVICE_HOST}/${GLANCE_DB_NAME}"
 done
 
-for cfg in /etc/glance/glance-api.conf; do
-    crudini --set $cfg \
-        DEFAULT \
-        registry_host \
-        $MY_IP
-done
+cat > /openrc <<EOF
+export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
+export OS_USERNAME=glance
+export OS_PASSWORD="${GLANCE_KEYSTONE_PASSWORD}"
+export OS_TENANT_NAME=${ADMIN_TENANT_NAME}
+EOF
+
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 3192d30bae..4a71d22826 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -11,6 +11,7 @@ RUN yum install -y openstack-keystone \
 	; yum clean all
 
 ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
 
 EXPOSE 5000 35357
 
diff --git a/docker/keystone/check.sh b/docker/keystone/check.sh
new file mode 100755
index 0000000000..f967938616
--- /dev/null
+++ b/docker/keystone/check.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+RES=0
+
+. /openrc
+if ! keystone token-get > /dev/null; then
+    echo "ERROR: keystone token-get failed" >&2
+    RES=1
+fi
+
+exit $RES
+
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index aa90cc0924..fc01db6940 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -33,6 +33,13 @@ crudini --del /etc/keystone/keystone.conf \
     log_dir
 crudini --set /etc/keystone/keystone.conf DEFAULT use_stderr True
 
+cat > /openrc <<EOF
+export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
+export OS_USERNAME=admin
+export OS_PASSWORD="${KEYSTONE_ADMIN_PASSWORD}"
+export OS_TENANT_NAME=${ADMIN_TENANT_NAME}
+EOF
+
 /usr/bin/keystone-manage db_sync
 /usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone