diff --git a/actions-services.yml b/actions-services.yml
index 98e84210..fccc1410 100644
--- a/actions-services.yml
+++ b/actions-services.yml
@@ -93,7 +93,10 @@ services:
 
       # Include the features folder (for the FakeIdBrokerClient class)
       - ./features:/data/features
-    command: 'bash -c "/data/enable-exampleauth-module.sh && /data/run.sh"'
+    command: >
+      bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/lib/Auth/Source/yii migrate --interactive=0 &&
+      /data/enable-exampleauth-module.sh &&
+      /data/run.sh"
     environment:
       ADMIN_EMAIL: "john_doe@there.com"
       ADMIN_PASS: "a"
diff --git a/docker-compose.yml b/docker-compose.yml
index d4384eb4..194bc100 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -171,7 +171,10 @@ services:
       - ./modules/expirychecker:/data/vendor/simplesamlphp/simplesamlphp/modules/expirychecker
       - ./modules/profilereview:/data/vendor/simplesamlphp/simplesamlphp/modules/profilereview
       - ./modules/silauth:/data/vendor/simplesamlphp/simplesamlphp/modules/silauth
-    command: 'bash -c "/data/enable-exampleauth-module.sh && /data/run.sh"'
+    command: >
+      bash -c "whenavail db 3306 60 /data/vendor/simplesamlphp/simplesamlphp/modules/silauth/lib/Auth/Source/yii migrate --interactive=0 &&
+      /data/enable-exampleauth-module.sh &&
+      /data/run.sh"
     ports:
       - "8085:80"
     environment: