diff --git a/chart/templates/deployment-celery-worker.yaml b/chart/templates/deployment-celery-worker.yaml
index 8c5c8dec8e07b31235e83112ba2559c3cc9b9bc3..c7aee3cdae648f0e4a2dca3ac9faa3a8dad8abee 100644
--- a/chart/templates/deployment-celery-worker.yaml
+++ b/chart/templates/deployment-celery-worker.yaml
@@ -62,7 +62,7 @@ spec:
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ printf "%s.%s-postgresql.credentials.postgresql.acid.zalan.do" .Values.dbUser .Release.Name }}
+                name: {{ .Values.postgresql.dbUser }}-{{ printf "%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
                 key: password
           {{end}}
           - name: POSTGRES_USER
diff --git a/chart/templates/deployment-django.yaml b/chart/templates/deployment-django.yaml
index e6ad0980ec0540a0a66caa23e9b2b5952e27674b..169bd2add444ba7fa5acdd3422a04665e2009a31 100644
--- a/chart/templates/deployment-django.yaml
+++ b/chart/templates/deployment-django.yaml
@@ -61,7 +61,7 @@ spec:
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ printf "%s.%s-postgresql.credentials.postgresql.acid.zalan.do" .Values.dbUser .Release.Name }}
+                name: {{ .Values.postgresql.dbUser }}-{{ printf "%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
                 key: password
           {{end}}
           - name: POSTGRES_USER