diff --git a/compose.yaml b/compose.yaml
index 0e3481d..a5bd0a0 100755
--- a/compose.yaml
+++ b/compose.yaml
@@ -8,6 +8,9 @@ services:
     environment:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    depends_on:
+      db:
+        condition: service_healthy
     networks:
       - proxy
 
@@ -32,6 +35,11 @@ services:
       POSTGRES_USER: myuser
       POSTGRES_PASSWORD: supersecretpassword
       POSTGRES_DB: app_db
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U myuser -d app_db" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
       - proxy