diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index b282e42e6a..aec2d72537 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Exit the container if MariaDB is not yet up - then depend on kube to restart
+if [ -z "$MARIADBMASTER_PORT_3306_TCP_PORT" ]; then
+        exit 1
+fi
+
 : ${KEYSTONE_ADMIN_PASSWORD:=kolla}
 : ${ADMIN_TENANT_NAME:=admin}