diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index a560547c1f..fa8e828149 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -169,8 +169,11 @@ services:
         volumes:
             - ./docker/temporal/dynamicconfig:/etc/temporal/config/dynamicconfig
         depends_on:
-            - db
-            - elasticsearch
+            db:
+                condition: service_healthy
+            elasticsearch:
+                condition: service_started
+
     temporal-admin-tools:
         environment:
             - TEMPORAL_CLI_ADDRESS=temporal:7233
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 6788685104..d41b7c8b25 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -121,6 +121,7 @@ services:
         extends:
             file: docker-compose.base.yml
             service: temporal
+
     temporal-admin-tools:
         extends:
             file: docker-compose.base.yml