diff --git a/deploy/docker/docker-compose-tiny.yaml b/deploy/docker/docker-compose-tiny.yaml
index 10c1b4ea54..51b547996c 100644
--- a/deploy/docker/docker-compose-tiny.yaml
+++ b/deploy/docker/docker-compose-tiny.yaml
@@ -140,6 +140,11 @@ services:
     env_file:
       - environment_tiny/router
       - environment_tiny/common
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://router:8888/druid/coordinator/v1/datasources/flattened_spans"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
 
   flatten-processor:
     image: signoz/flattener-processor:0.2.0
@@ -171,11 +176,10 @@ services:
       - DruidDatasource=flattened_spans
       - STORAGE=druid
       - POSTHOG_API_KEY=H-htDCae7CR3RV57gUzmol6IAKtm5IMCvbcm_fwnL-w
-    healthcheck:
-      test: ["CMD", "wget", "--spider", "-q", "http://router:8888/status/health"]
-      interval: 30s
-      timeout: 5s
-      retries: 5
+      
+    depends_on: 
+      router:
+        condition: service_healthy
     
   frontend:
     image: signoz/frontend:0.3.0
diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
index dcdd83237f..589b203244 100644
--- a/deploy/docker/docker-compose.yaml
+++ b/deploy/docker/docker-compose.yaml
@@ -135,6 +135,11 @@ services:
       - router
     env_file:
       - environment_small/router
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://router:8888/druid/coordinator/v1/datasources/flattened_spans"]
+      interval: 30s
+      timeout: 5s
+      retries: 5
 
   flatten-processor:
     image: signoz/flattener-processor:0.2.0
@@ -167,11 +172,9 @@ services:
       - STORAGE=druid
       - POSTHOG_API_KEY=H-htDCae7CR3RV57gUzmol6IAKtm5IMCvbcm_fwnL-w
 
-    healthcheck:
-      test: ["CMD", "wget", "--spider", "-q", "http://router:8888/status/health"]
-      interval: 30s
-      timeout: 5s
-      retries: 5
+    depends_on: 
+      router:
+        condition: service_healthy
     
   frontend:
     image: signoz/frontend:0.3.0