diff --git a/docker-compose.yaml b/docker-compose.yaml
index abb94f3..3f23512 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -80,6 +80,11 @@ services:
     restart: unless-stopped
     volumes:
       - ./postgres:/var/lib/postgresql/data
+    healthcheck:
+       test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+       interval: 10s
+       timeout: 5s
+       retries: 5
     environment:
       POSTGRES_USER: MediaManager
       POSTGRES_DB: MediaManager