diff --git a/chart/templates/deployment-celery.yaml b/chart/templates/deployment-celery.yaml
index 0b842187b2ac31321d2b7ba1435d7869415768ee..d09e939b13deac536bddab872643771c3ee40c53 100644
--- a/chart/templates/deployment-celery.yaml
+++ b/chart/templates/deployment-celery.yaml
@@ -59,11 +59,16 @@ spec:
             value: {{ printf "%s-postgresql" .Release.Name }}
           - name: DATABASE_NAME
             value: {{ .Values.postgresql.postgresqlDatabase}}
+          # - name: DATABASE_PASSWORD
+          #   valueFrom:
+          #     secretKeyRef:
+          #       name: {{ printf "%s-credentials" .Release.Name }}
+          #       key: database_password
           - name: DATABASE_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ printf "%s-credentials" .Release.Name }}
-                key: database_password
+                name: {{ printf "postgres.%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
+                key: password
           - name: DATABASE_USER
             valueFrom:
               secretKeyRef:
diff --git a/chart/templates/deployment-django.yaml b/chart/templates/deployment-django.yaml
index 6de09bc9b49add71d399bb0c3abfcfafd60a52dd..b0a2f2b65d7414abfb8f39b76582452a437d9cd3 100644
--- a/chart/templates/deployment-django.yaml
+++ b/chart/templates/deployment-django.yaml
@@ -62,8 +62,13 @@ spec:
           - name: DATABASE_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ printf "%s-credentials" .Release.Name }}
-                key: database_password
+                name: {{ printf "postgres.%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
+                key: password
+          # - name: DATABASE_PASSWORD
+          #   valueFrom:
+          #     secretKeyRef:
+          #       name: {{ printf "%s-credentials" .Release.Name }}
+          #       key: database_password
           - name: DATABASE_USER
             valueFrom:
               secretKeyRef: