diff --git a/docker-compose.yml b/docker-compose.yml
index 5018d45e..7949db00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -119,7 +119,8 @@ services:
     ports:
       - "${NGINX_EXPOSE_PORT:-8080}:${NGINX_PORT:-8080}"
     depends_on:
-      - zammad-railsserver
+      zammad-railsserver:
+        condition: service_healthy
 
   zammad-postgresql:
     environment:
@@ -134,6 +135,12 @@ services:
   zammad-railsserver:
     <<: *zammad-service
     command: ["zammad-railsserver"]
+    healthcheck:
+      test: ["CMD", "curl", "-sf", "http://127.0.0.1:${ZAMMAD_RAILSSERVER_PORT:-3000}"]
+      interval: 30s
+      timeout: 5s
+      start_period: 120s
+      retries: 3
 
   zammad-redis:
     image: redis:${REDIS_VERSION:-8.6.2-alpine}