diff --git a/docker-compose.yaml b/docker-compose.yaml
index a8d9e2c..86bd9f7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,6 +8,8 @@ services:
       POSTGRES_DB: court
     volumes:
       - ./initdb/:/docker-entrypoint-initdb.d
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
   court:
     build: .
     ports:
@@ -15,4 +17,5 @@ services:
     environment:
       DB_HOST: db
     depends_on:
-      - db
+      db:
+        condition: service_healthy