diff --git a/celerybeat-schedule-shm b/celerybeat-schedule-shm
index 0bedecb..337592b 100644
Binary files a/celerybeat-schedule-shm and b/celerybeat-schedule-shm differ
diff --git a/celerybeat-schedule-wal b/celerybeat-schedule-wal
index c913bcc..f908bfc 100644
Binary files a/celerybeat-schedule-wal and b/celerybeat-schedule-wal differ
diff --git a/docker-compose.yml b/docker-compose.yml
index f4ad351..d30f6c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,12 @@ services:
       - "5432:5432"
     volumes:
       - db_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+      start_period: 10s
     restart: unless-stopped
 
   pgbouncer:
@@ -40,8 +46,15 @@ services:
       PGBOUNCER_LOG_POOLER_ERRORS: "1"
     ports:
       - "6432:6432"
+    healthcheck:
+      test: ["CMD-SHELL", "timeout 1 bash -c '</dev/tcp/localhost/6432' || exit 1"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+      start_period: 15s
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     restart: unless-stopped
 
   pgadmin:
@@ -104,10 +117,14 @@ services:
       DB_USER: postgres
       DB_PASSWORD: postgres
     depends_on:
-      - pgbouncer
-      - postgres
-      - redis
-      - rabbitmq
+      pgbouncer:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_started
+      rabbitmq:
+        condition: service_started
     restart: unless-stopped
 
   celery_worker:
@@ -136,10 +153,14 @@ services:
       DB_USER: postgres
       DB_PASSWORD: postgres
     depends_on:
-      - pgbouncer
-      - postgres
-      - redis
-      - rabbitmq
+      pgbouncer:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_started
+      rabbitmq:
+        condition: service_started
     restart: unless-stopped
 
   celery_beat:
@@ -167,10 +188,14 @@ services:
       CELERY_BROKER_URL: amqp://guest:guest@rabbitmq:5672//
       CELERY_RESULT_BACKEND: redis://redis:6379/0
     depends_on:
-      - pgbouncer
-      - postgres
-      - redis
-      - rabbitmq
+      pgbouncer:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_started
+      rabbitmq:
+        condition: service_started
     restart: unless-stopped
 
 volumes: