diff --git a/kestra/docker-compose.yml b/kestra/docker-compose.yml
index 8fe2808..e845658 100644
--- a/kestra/docker-compose.yml
+++ b/kestra/docker-compose.yml
@@ -41,7 +41,7 @@ services:
     user: root
     depends_on:
       postgres:
-        condition: service_started
+        condition: service_healthy
     restart: unless-stopped
 
   postgres:
@@ -52,4 +52,9 @@ services:
       - POSTGRES_DB=kestra
       - POSTGRES_USER=kestra
       - POSTGRES_PASSWORD=k3str4
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
     restart: unless-stopped