diff --git a/hawkbit-runtime/docker/docker-compose-deps-mysql.yml b/hawkbit-runtime/docker/docker-compose-deps-mysql.yml
index 62c725813..6be6beef9 100644
--- a/hawkbit-runtime/docker/docker-compose-deps-mysql.yml
+++ b/hawkbit-runtime/docker/docker-compose-deps-mysql.yml
@@ -22,6 +22,10 @@ services:
     restart: always
     ports:
       - "3306:3306"
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 20s
+      retries: 10
     labels:
       NAME: "mysql"
 
diff --git a/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml b/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml
index 613c6f94d..85fb1c109 100644
--- a/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml
+++ b/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml
@@ -28,6 +28,9 @@ services:
     restart: always
     ports:
       - "8081:8081"
+    depends_on:
+      mysql:
+        condition: service_healthy
     labels:
       NAME: "hawkbit-ddi"
 
@@ -43,6 +46,9 @@ services:
       - 'SPRING_RABBITMQ_PASSWORD=guest'
       - 'SPRING_DATASOURCE_USERNAME=root'
     restart: always
+    depends_on:
+      mysql:
+        condition: service_healthy
     labels:
       NAME: "hawkbit-dmf"
 
@@ -62,6 +68,9 @@ services:
     restart: always
     ports:
       - "8080:8080"
+    depends_on:
+      mysql:
+        condition: service_healthy
     labels:
       NAME: "hawkbit-mgmt"
 
@@ -82,6 +91,9 @@ services:
     restart: always
     ports:
       - "8082:8082"
+    depends_on:
+      mysql:
+        condition: service_healthy
     labels:
       NAME: "hawkbit-vv8-ui"
 
diff --git a/hawkbit-runtime/docker/docker-compose-monolith-mysql.yml b/hawkbit-runtime/docker/docker-compose-monolith-mysql.yml
index 3ee1c8020..f970a516c 100644
--- a/hawkbit-runtime/docker/docker-compose-monolith-mysql.yml
+++ b/hawkbit-runtime/docker/docker-compose-monolith-mysql.yml
@@ -54,6 +54,9 @@ services:
     restart: always
     ports:
       - "8080:8080"
+    depends_on:
+      mysql:
+        condition: service_healthy
     labels:
       NAME: "hawkbit"