diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 9e62c13..aa45a43 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -73,8 +73,10 @@ services:
     # ports:
     #   - "8080:8080"
     depends_on:
-      - postgres
-      - rabbitmq
+      postgres:
+        condition: service_started
+      rabbitmq:
+        condition: service_healthy
     networks:
       - nyanimedb-network