diff --git a/docker-compose.yml b/docker-compose.yml
index f7f21ed..b554633 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,8 @@ services:
             dockerfile: docker/Dockerfile
             target: mapg_dev
         depends_on:
-            - mariadb
+            mariadb:
+                condition: service_healthy
         ports:
             - 80:80
             - 5000:5000
@@ -26,6 +27,10 @@ services:
             MYSQL_DATABASE: 'mapguesser'
             MYSQL_USER: 'mapguesser'
             MYSQL_PASSWORD: 'mapguesser'
+        healthcheck:
+            test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', '$$MYSQL_USER', '-p$$MYSQL_PASSWORD' ]
+            timeout: 5s
+            retries: 10
     adminer:
         image: adminer:4.8.1-standalone
         ports: