diff --git a/chart/templates/deployment-celery-worker.yaml b/chart/templates/deployment-celery-worker.yaml
index f4d444bc8df2b22fbc40ecce6a9e2a45f9b0f54a..8c5c8dec8e07b31235e83112ba2559c3cc9b9bc3 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 "postgres.%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
+                name: {{ printf "%s.%s-postgresql.credentials.postgresql.acid.zalan.do" .Values.dbUser .Release.Name }}
                 key: password
           {{end}}
           - name: POSTGRES_USER
diff --git a/chart/templates/deployment-django.yaml b/chart/templates/deployment-django.yaml
index aa3d3588576914799131397507f845b684bb7b47..e6ad0980ec0540a0a66caa23e9b2b5952e27674b 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 "postgres.%s-postgresql.credentials.postgresql.acid.zalan.do" .Release.Name }}
+                name: {{ printf "%s.%s-postgresql.credentials.postgresql.acid.zalan.do" .Values.dbUser .Release.Name }}
                 key: password
           {{end}}
           - name: POSTGRES_USER
diff --git a/chart/templates/deployment-postgres.yaml b/chart/templates/deployment-postgres.yaml
index c0e191b4372062587521613d4613656d4043e483..bafbd4ad1cb2a98a8c16767f88e92e2510059669 100644
--- a/chart/templates/deployment-postgres.yaml
+++ b/chart/templates/deployment-postgres.yaml
@@ -67,6 +67,10 @@ spec:
     synchronous_mode: false
     synchronous_mode_strict: false
     maximum_lag_on_failover: 33554432
+    pg_hba:
+    - hostssl all all 0.0.0.0/0 md5
+    - host    all all 0.0.0.0/0 md5
+    - local   all all           trust
 
   # restore a Postgres DB with point-in-time-recovery
   # with a non-empty timestamp, clone from an S3 bucket using the latest backup before the timestamp