diff --git a/docker-compose.yml b/docker-compose.yml
index 7f93fcbb..d167de26 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -169,6 +169,12 @@ services:
       elasticsearch:
         condition: service_healthy
     logging: *default-logging
+    healthcheck:
+      test: [ "CMD-SHELL", "celery -A evibes status | grep -q 'OK'" ]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 15s
 
   beat:
     container_name: beat
@@ -186,6 +192,10 @@ services:
     depends_on:
       worker:
         condition: service_healthy
+      stock_updater:
+        condition: service_healthy
+      database:
+        condition: service_healthy
     logging: *default-logging
     healthcheck:
       test: [ "CMD", "bash", "-c", "pgrep -f 'celery beat' >/dev/null" ]