diff --git a/docker-compose.yml b/docker-compose.yml
index 44e9555..f29e719 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,6 +78,11 @@ services:
       --scheduler django
       -n worker1@%h
       -n worker2@%h
+    healthcheck:
+      test: celery --app newsreader status || exit 1
+      interval: 10s
+      timeout: 10s
+      retries: 5
     depends_on:
       rabbitmq:
         condition: service_started
@@ -107,9 +112,9 @@ services:
       newsreader.wsgi:application
     healthcheck:
       test: /usr/bin/curl --fail http://django:8000 || exit 1
-      interval: 30s
+      interval: 10s
       timeout: 10s
-      retries: 10
+      retries: 5
     depends_on:
       memcached:
         condition: service_started