diff --git a/gitea/compose.yml b/gitea/compose.yml
index 91297d8..de74908 100644
--- a/gitea/compose.yml
+++ b/gitea/compose.yml
@@ -6,13 +6,19 @@ services:
     container_name: gitea
     restart: always
     depends_on:
-      - gitea_db
+      gitea_db:
+        condition: service_healthy
     environment:
       - GITEA__database__DB_TYPE=postgres
       - GITEA__database__HOST=gitea_db:5432
       - GITEA__database__NAME=gitea
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=${DB_PASSWORD}
+    healthcheck:
+      test: curl -f http://localhost:3000/api/healthz || exit 1
+      interval: 30s
+      timeout: 10s
+      retries: 3
     networks:
       - default
       - traefik
@@ -29,6 +35,11 @@ services:
       - POSTGRES_DB=gitea
       - POSTGRES_USER=gitea
       - POSTGRES_PASSWORD=${DB_PASSWORD}
+    healthcheck:
+      test: pg_isready
+      interval: 30s
+      timeout: 10s
+      retries: 3
     networks:
       - default
     volumes: