diff --git a/docker-compose.yml b/docker-compose.yml
index fb730de4..9d0586a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7058,15 +7058,15 @@ services:
     container_name: zitadel-pg-db
     environment:
       POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${ZITADEL_ADMIN_DB_PASSWORD}
+      POSTGRES_PASSWORD: ${ZITADEL_DB_ADMIN_PASSWORD}
     expose:
       - 5432
-    # healthcheck:
-    #   test: ["CMD-SHELL", "pg_isready", "-d"]
-    #   interval: '10s'
-    #   timeout: '30s'
-    #   retries: 5
-    #   start_period: '20s'
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "postgres"]
+      interval: '10s'
+      timeout: '30s'
+      retries: 5
+      start_period: '20s'
     image: postgres:16-alpine
     restart: always
     volumes: