diff --git a/docker-compose.yml b/docker-compose.yml
index ca95e6fc..79f2874d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -73,6 +73,11 @@ services:
     volumes:
       - ./logs:/app/logs
       - ./exports:/app/exports
+    healthcheck:
+      test: ["CMD-SHELL", "celery -A app.core.celery_config inspect ping --timeout 10 || exit 1"]
+      interval: 30s
+      timeout: 15s
+      retries: 3
 
   # Celery beat for scheduled tasks
   celery-beat:
@@ -86,6 +91,8 @@ services:
     depends_on:
       redis:
         condition: service_healthy
+    healthcheck:
+      disable: true
 
   # Flower monitoring dashboard
   flower:
@@ -102,6 +109,11 @@ services:
     depends_on:
       redis:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:5555/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
 
 volumes:
   postgres_data: