diff --git a/devops/docker/db/entrypoint.sh b/devops/docker/db/entrypoint.sh
index 168bb590f52fe4830dbfef5134481a9fe9c68e25..8be1f15524b89bf8d6a9b6638a28e322142a24b3 100755
--- a/devops/docker/db/entrypoint.sh
+++ b/devops/docker/db/entrypoint.sh
@@ -18,6 +18,12 @@
 # @license https://opensource.org/licenses/GPL-3.0 GNU GPLv3
 
 until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/db ]; do :; done
+while ! grep -q MYSQL_ROOT_PASSWORD ./data/docker/env/db
+do
+    echo "wait for MYSQL_ROOT_PASSWORD"
+    sleep 1
+done
 set -a; . ./data/docker/env/db; set +a
 
+echo "set up db"
 exec docker-entrypoint.sh "$@"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f7c8cc5065b662fb68155bba7327f4ccf9ea571..7eb40155c786a04625d1f428e6978ef9a618e7d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,6 +52,7 @@ services:
       - db-data:/var/lib/mysql
     depends_on:
       - env
+      - autoconfig
     entrypoint: ["devops/docker/db/entrypoint.sh"]
     command: [
       "mysqld",
@@ -90,7 +91,6 @@ services:
       - ./:/usr/local/vufind:rw
     depends_on:
       - env
-      - db
     entrypoint: ["devops/docker/autoconfig/entrypoint.sh"]
     command: ["vufind", "deploy"]