diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 103701db203b766752d8a20dfdc49341d8c3999e..c54c15947770a3a3608ea1711d8fd526e90e212a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,11 +55,8 @@ services:
   before_script:
     - helm version
   variables:
-    # POSTGRES_USER: ${POSTGRES_USER}
-    # POSTGRES_DB: ${POSTGRES_DB}
-    POSTGRES_USER: postgres
-    POSTGRES_DB: postgres
-
+    POSTGRES_USER: ${POSTGRES_USER}
+    POSTGRES_DB: ${POSTGRES_DB}
     POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     NODE_ENV: production
   script:
diff --git a/chart/templates/deployment-celery.yaml b/chart/templates/deployment-celery.yaml
index d09e939b13deac536bddab872643771c3ee40c53..9683f6658fd902978fec7a400475f523d0ccff93 100644
--- a/chart/templates/deployment-celery.yaml
+++ b/chart/templates/deployment-celery.yaml
@@ -67,7 +67,7 @@ spec:
           - name: DATABASE_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ printf "postgres.%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
+                name: {{ printf "%s.%s-postgresql.credentials.postgresql.acid.zalan.do" .Values.postgresqlZalando.dbUser .Release.Name }}
                 key: password
           - name: DATABASE_USER
             valueFrom:
diff --git a/chart/templates/deployment-django.yaml b/chart/templates/deployment-django.yaml
index b0a2f2b65d7414abfb8f39b76582452a437d9cd3..06f5afade98810121575d1134441250aa9b1d9d6 100644
--- a/chart/templates/deployment-django.yaml
+++ b/chart/templates/deployment-django.yaml
@@ -62,7 +62,7 @@ spec:
           - name: DATABASE_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ printf "postgres.%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
+                name: {{ printf "%s.%s-postgresql.credentials.postgresql.acid.zalan.do" .Values.postgresqlZalando.dbUser .Release.Name }}
                 key: password
           # - name: DATABASE_PASSWORD
           #   valueFrom: