diff --git a/docker-compose.yml b/docker-compose.yml
index 96b962d..03c4000 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,8 +49,10 @@ services:
       - images_data:/app/images
       - library_config:/app/config
     depends_on:
-      - postgres
-      - opensearch
+      postgres:
+        condition: service_started
+      opensearch:
+        condition: service_healthy
     networks:
       - storycove-network
 
@@ -92,6 +94,12 @@ services:
     networks:
       - storycove-network
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:9200/_cluster/health || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 60s
 
   opensearch-dashboards:
     image: opensearchproject/opensearch-dashboards:3.2.0