diff --git a/peekaping.yaml b/peekaping.yaml
index 5ed1dba..567a7a2 100644
--- a/peekaping.yaml
+++ b/peekaping.yaml
@@ -18,6 +18,12 @@ services:
         condition: any
       labels:
         diun.enable: "true"
+      healthcheck:
+        test: ["CMD-SHELL", "pg_isready -U peekaping -d peekaping -h localhost"]
+        interval: 10s
+        timeout: 5s
+        retries: 5
+        start_period: 10s
 
   peekaping:
     image: ghcr.io/0xfurai/peekaping-bundle-postgres:latest
@@ -33,7 +39,8 @@ services:
       - SERVER_PORT=8034
       - SERVER_HOST=0.0.0.0
     depends_on:
-      - peekaping-postgres
+      peekaping-postgres:
+        condition: service_healthy
     deploy:
       restart_policy:
         condition: any