diff --git a/src/pkg/builder/deployment_builder.go b/src/pkg/builder/deployment_builder.go
index d96a7c5..686aefb 100644
--- a/src/pkg/builder/deployment_builder.go
+++ b/src/pkg/builder/deployment_builder.go
@@ -112,6 +112,16 @@ func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[
 					ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: masterkey.MasterKeyName(zitadel)}, Key: masterkey.Key}},
 				},
 
+				{
+					Name:      "ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD",
+					ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: zitadel.Spec.PostgreSQLClusterRef.Name + "-superuser"}, Key: "password"}},
+				},
+
+				{
+					Name:      "ZITADEL_DATABASE_POSTGRES_USER_PASSWORD",
+					ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: zitadel.Spec.PostgreSQLClusterRef.Name + "-app"}, Key: "password"}},
+				},
+
 				// {
 				// 	Name:  "ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_ROOTCERT",
 				// 	Value: "/certs/ca.crt",
diff --git a/src/pkg/builder/job_builder.go b/src/pkg/builder/job_builder.go
index 4538186..8672acb 100644
--- a/src/pkg/builder/job_builder.go
+++ b/src/pkg/builder/job_builder.go
@@ -81,6 +81,15 @@ func (b *Builder) BuildInitJob(zitadel *zitadelv1alpha1.ZitadelCluster, key type
 								// 	Name:  "ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY",
 								// 	Value: "/certs/tls.key",
 								// },
+								{
+									Name:      "ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD",
+									ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: zitadel.Spec.PostgreSQLClusterRef.Name + "-superuser"}, Key: "password"}},
+								},
+
+								{
+									Name:      "ZITADEL_DATABASE_POSTGRES_USER_PASSWORD",
+									ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: zitadel.Spec.PostgreSQLClusterRef.Name + "-app"}, Key: "password"}},
+								},
 							},
 							VolumeMounts: []corev1.VolumeMount{
 								{Name: "zitadel-config-yaml", MountPath: "/config"},
@@ -177,6 +186,16 @@ func (b *Builder) BuildSetupJob(zitadel *zitadelv1alpha1.ZitadelCluster, key typ
 								// 	Name:  "ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY",
 								// 	Value: "/certs/tls.key",
 								// },
+								//
+								{
+									Name:      "ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD",
+									ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: zitadel.Spec.PostgreSQLClusterRef.Name + "-superuser"}, Key: "password"}},
+								},
+
+								{
+									Name:      "ZITADEL_DATABASE_POSTGRES_USER_PASSWORD",
+									ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: zitadel.Spec.PostgreSQLClusterRef.Name + "-app"}, Key: "password"}},
+								},
 							},
 							VolumeMounts: []corev1.VolumeMount{
 								{Name: "zitadel-config-yaml", MountPath: "/config"},