diff --git a/docker-compose.yml b/docker-compose.yml
index 2579559a..cbef0557 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7025,9 +7025,9 @@ services:
     container_name: zitadel
     image: ghcr.io/zitadel/zitadel:latest
     command: 'start-from-init --masterkeyFromEnv --tlsMode external'
-    # depends_on:
-    #   zitadel-pg-db:
-    #     condition: 'service_healthy'
+    depends_on:
+      zitadel-pg-db:
+        condition: 'service_healthy'
     environment:
       ZITADEL_DATABASE_POSTGRES_HOST: zitadel-pg-db
       ZITADEL_DATABASE_POSTGRES_PORT: 5432
@@ -7063,7 +7063,7 @@ services:
     expose:
       - 5432
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "zitadel"]
+      test: ["CMD-SHELL", "pg_isready"]
       interval: '10s'
       timeout: '30s'
       retries: 5