diff --git a/docker-compose.yml b/docker-compose.yml
index 50eafe29b25..6ad331cb19f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -132,7 +132,8 @@ services:
     ports:
       - '8085:8085'
     depends_on:
-      - planetscale-mysql
+      planetscale-mysql:
+        condition: service_healthy
     restart: unless-stopped
     healthcheck:
       test: ['CMD', 'nc', '-z', '127.0.0.1', '8085']
@@ -155,6 +156,10 @@ services:
     networks:
       - databases
     tmpfs: /var/lib/planetscale-mysql
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
 
   postgres14:
     image: postgres:14
@@ -196,6 +201,10 @@ services:
     networks:
       - databases
     tmpfs: /var/lib/mysql
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
 
   mysql-5-7:
     image: mysql:5.7.44
@@ -210,6 +219,10 @@ services:
     networks:
       - databases
     tmpfs: /var/lib/mysql
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
 
   mysql-8-0:
     image: mysql:8.0.28
@@ -224,6 +237,10 @@ services:
     networks:
       - databases
     tmpfs: /var/lib/mysql8
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
 
   mariadb-10-0:
     image: mariadb:10