diff --git a/gitea-traefik-letsencrypt-docker-compose.yml b/gitea-traefik-letsencrypt-docker-compose.yml
index bac21ad..a784617 100644
--- a/gitea-traefik-letsencrypt-docker-compose.yml
+++ b/gitea-traefik-letsencrypt-docker-compose.yml
@@ -34,6 +34,12 @@ services:
       POSTGRES_USER: giteadbuser
       # Database password (replace with yours)
       POSTGRES_PASSWORD: etFneCEtAWRKkfeQmkvwLWE
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -h 127.0.0.1"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 60s
     restart: unless-stopped
 
   gitea:
@@ -78,8 +84,10 @@ services:
       - "traefik.http.middlewares.compresstraefik.compress=true"
     restart: unless-stopped
     depends_on:
-      - postgres
-      - traefik
+      postgres:
+        condition: service_healthy
+      traefik:
+        condition: service_healthy
 
   traefik:
     # Image tag (replace with yours)
@@ -175,5 +183,7 @@ services:
       POSTGRES_PASSWORD: etFneCEtAWRKkfeQmkvwLWE
     restart: unless-stopped
     depends_on:
-      - postgres
-      - gitea
+      postgres:
+        condition: service_healthy
+      gitea:
+        condition: service_healthy