diff --git a/openproject/configmap_core.yaml b/openproject/configmap_core.yaml
index 6d3cbe5..478217d 100644
--- a/openproject/configmap_core.yaml
+++ b/openproject/configmap_core.yaml
@@ -7,6 +7,8 @@ metadata:
 data:
   DATABASE_HOST: "{{ .dbHostname }}"
   DATABASE_PORT: "5432"
+  DATABASE_NAME: "{{ .dbName }}"
+  DATABASE_USERNAME: "{{ .dbUsername }}"
   DATABASE_URL: "postgresql://{{ .dbUsername }}@{{ .dbHostname }}:5432/{{ .dbName }}"
   OPENPROJECT_SEED_ADMIN_USER_PASSWORD_RESET: "{{ .adminPasswordReset }}"
   OPENPROJECT_SEED_ADMIN_USER_NAME: "{{ .adminUserName }}"
diff --git a/openproject/web-deployment.yaml b/openproject/web-deployment.yaml
index b628493..9e86717 100644
--- a/openproject/web-deployment.yaml
+++ b/openproject/web-deployment.yaml
@@ -77,7 +77,7 @@ spec:
           command: [
             'sh',
             '-c',
-            'until pg_isready -h $DATABASE_HOST -p $DATABASE_PORT; do echo "waiting for database $DATABASE_HOST:$DATABASE_PORT"; sleep 2; done; echo "Database is ready!"'
+            'until pg_isready -h $DATABASE_HOST -p $DATABASE_PORT -d $DATABASE_NAME -U $DATABASE_USERNAME; do echo "waiting for database $DATABASE_HOST:$DATABASE_PORT"; sleep 2; done; echo "Database is ready!"'
           ]
           envFrom:
             - configMapRef:
diff --git a/openproject/worker-deployment.yaml b/openproject/worker-deployment.yaml
index c9247de..66df52b 100644
--- a/openproject/worker-deployment.yaml
+++ b/openproject/worker-deployment.yaml
@@ -77,7 +77,7 @@ spec:
           command: [
             'sh',
             '-c',
-            'until pg_isready -h $DATABASE_HOST -p $DATABASE_PORT; do echo "waiting for database $DATABASE_HOST:$DATABASE_PORT"; sleep 2; done; echo "Database is ready!"'
+            'until pg_isready -h $DATABASE_HOST -p $DATABASE_PORT -d $DATABASE_NAME -U $DATABASE_USERNAME; do echo "waiting for database $DATABASE_HOST:$DATABASE_PORT"; sleep 2; done; echo "Database is ready!"'
           ]
           envFrom:
             - configMapRef: