diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 72cd4a85..c24f6158 100755
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -31,12 +31,18 @@ services:
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
+      interval: 60s
+      timeout: 10s
+      retries: 3s
 
   datapusher:
     image: ckan/ckan-base-datapusher:${DATAPUSHER_VERSION}
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]
+      interval: 60s
+      timeout: 10s
+      retries: 3s
 
   db:
     build:
diff --git a/docker-compose.yml b/docker-compose.yml
index e7c61970..59588df7 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,7 +46,10 @@ services:
       - site_packages:/usr/lib/python3.10/site-packages
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
+      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000/api/action/status_show"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
     
   datapusher:
     networks:
@@ -56,6 +59,9 @@ services:
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
 
   db:
     build: