diff --git a/docker/environments/docker-compose.yml b/docker/environments/docker-compose.yml
index 143b22f..b598113 100644
--- a/docker/environments/docker-compose.yml
+++ b/docker/environments/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - App__ConnectionString=Host=db;Port=5432;Database=${DB_NAME:?DB_NAME is required};Username=${DB_USER:?DB_USER is required};Password=${DB_PASS:?DB_PASS is required}
     depends_on:
       db:
-        condition: service_started
+        condition: service_healthy
     restart: "no"
 
   api:
@@ -72,6 +72,11 @@ services:
       - pgdata:/var/lib/postgresql/data
     networks:
       - internal
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER}"]
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
 volumes:
   pgdata: