diff --git a/integration-tests/docker/docker-compose.base.yml b/integration-tests/docker/docker-compose.base.yml
index 2f60212bc663..ebd6ce5c502c 100644
--- a/integration-tests/docker/docker-compose.base.yml
+++ b/integration-tests/docker/docker-compose.base.yml
@@ -68,6 +68,11 @@ services:
       - ./service-supervisords/metadata-storage.conf:/usr/lib/druid/conf/metadata-storage.conf
     env_file:
       - ./environment-configs/common
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "--silent"]
+      interval: 2s
+      timeout: 5s
+      retries: 30
 
 
 ### overlords
diff --git a/integration-tests/docker/docker-compose.cds-coordinator-metadata-query-disabled.yml b/integration-tests/docker/docker-compose.cds-coordinator-metadata-query-disabled.yml
index b435c290ef84..569cef1d06da 100644
--- a/integration-tests/docker/docker-compose.cds-coordinator-metadata-query-disabled.yml
+++ b/integration-tests/docker/docker-compose.cds-coordinator-metadata-query-disabled.yml
@@ -42,9 +42,12 @@ services:
       - druid_coordinator_segmentMetadata_disableSegmentMetadataQueries=true
       - druid_manager_segments_useIncrementalCache=always
     depends_on:
-      - druid-overlord
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-overlord:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-overlord:
     extends:
@@ -55,8 +58,10 @@ services:
       - druid_centralizedDatasourceSchema_enabled=true
       - druid_manager_segments_useIncrementalCache=always
     depends_on:
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-historical:
     extends:
diff --git a/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml b/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml
index b423ad9f6588..65bbef6b2384 100644
--- a/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml
+++ b/integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml
@@ -42,9 +42,12 @@ services:
       - druid_coordinator_segmentMetadata_metadataRefreshPeriod=PT15S
       - druid_manager_segments_useIncrementalCache=always
     depends_on:
-      - druid-overlord
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-overlord:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-overlord:
     extends:
@@ -56,8 +59,10 @@ services:
       - druid_centralizedDatasourceSchema_taskSchemaPublishDisabled=true
       - druid_manager_segments_useIncrementalCache=always
     depends_on:
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-historical:
     extends:
diff --git a/integration-tests/docker/docker-compose.centralized-datasource-schema.yml b/integration-tests/docker/docker-compose.centralized-datasource-schema.yml
index b47ce1533af8..52a15350b5f7 100644
--- a/integration-tests/docker/docker-compose.centralized-datasource-schema.yml
+++ b/integration-tests/docker/docker-compose.centralized-datasource-schema.yml
@@ -41,9 +41,12 @@ services:
       - druid_coordinator_segmentMetadata_metadataRefreshPeriod=PT15S
       - druid_manager_segments_useIncrementalCache=always
     depends_on:
-      - druid-overlord
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-overlord:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-overlord:
     extends:
@@ -54,8 +57,10 @@ services:
       - druid_centralizedDatasourceSchema_enabled=true
       - druid_manager_segments_useIncrementalCache=always
     depends_on:
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-historical:
     extends:
diff --git a/integration-tests/docker/docker-compose.cli-indexer.yml b/integration-tests/docker/docker-compose.cli-indexer.yml
index 0e4ba9c0ea26..32317162f402 100644
--- a/integration-tests/docker/docker-compose.cli-indexer.yml
+++ b/integration-tests/docker/docker-compose.cli-indexer.yml
@@ -36,8 +36,10 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-coordinator:
     extends:
@@ -46,9 +48,12 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-overlord
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-overlord:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-historical:
     extends:
diff --git a/integration-tests/docker/docker-compose.ldap-security.yml b/integration-tests/docker/docker-compose.ldap-security.yml
index e700edc5b94b..48bea3f0f390 100644
--- a/integration-tests/docker/docker-compose.ldap-security.yml
+++ b/integration-tests/docker/docker-compose.ldap-security.yml
@@ -53,10 +53,14 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-openldap
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
-      - druid-overlord
+      druid-openldap:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
+      druid-overlord:
+        condition: service_started
 
   druid-overlord:
     extends:
@@ -68,9 +72,12 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-openldap
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-openldap:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-historical:
     extends:
diff --git a/integration-tests/docker/docker-compose.query-error-test.yml b/integration-tests/docker/docker-compose.query-error-test.yml
index f75ff2efad79..c7fed645ce55 100644
--- a/integration-tests/docker/docker-compose.query-error-test.yml
+++ b/integration-tests/docker/docker-compose.query-error-test.yml
@@ -36,8 +36,10 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-coordinator:
     extends:
@@ -46,9 +48,12 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-overlord
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-overlord:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-broker:
     extends:
diff --git a/integration-tests/docker/docker-compose.query-retry-test.yml b/integration-tests/docker/docker-compose.query-retry-test.yml
index 2efb859a6f84..0a5c8bfc21bc 100644
--- a/integration-tests/docker/docker-compose.query-retry-test.yml
+++ b/integration-tests/docker/docker-compose.query-retry-test.yml
@@ -36,8 +36,10 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-coordinator:
     extends:
@@ -46,9 +48,12 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-overlord
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-overlord:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-broker:
     extends:
diff --git a/integration-tests/docker/docker-compose.yml b/integration-tests/docker/docker-compose.yml
index 277d4b27cbed..74ea2e98c4b3 100644
--- a/integration-tests/docker/docker-compose.yml
+++ b/integration-tests/docker/docker-compose.yml
@@ -36,9 +36,12 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-overlord
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-overlord:
+        condition: service_started
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-overlord:
     extends:
@@ -47,8 +50,10 @@ services:
     environment:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
     depends_on:
-      - druid-metadata-storage
-      - druid-zookeeper-kafka
+      druid-metadata-storage:
+        condition: service_healthy
+      druid-zookeeper-kafka:
+        condition: service_started
 
   druid-historical:
     extends: