diff --git a/chart/templates/cronjob-django-command.yaml b/chart/templates/cronjob-django-command.yaml
index 3470d041f0473ab27980a801a72be23c54009525..0dabc3b642ecd9387acb62ea9758c19f72e3636a 100644
--- a/chart/templates/cronjob-django-command.yaml
+++ b/chart/templates/cronjob-django-command.yaml
@@ -28,7 +28,7 @@ spec:
                 - name: DJANGO_DEBUG
                   value: "true"
                 - name: POSTGRES_USER
-                  value: "postgres"
+                  value: "{{ .Values.postgresql.dbUser }}"
                 - name: SECRET_KEY
                   value: {{ $root.Values.django.secretKey }}
                 - name: ALLOWED_HOSTS
diff --git a/chart/templates/deployment-celery-worker.yaml b/chart/templates/deployment-celery-worker.yaml
index a42959cf1d0b0e19fc160fa5fbbc00cd6cc4d090..f4d444bc8df2b22fbc40ecce6a9e2a45f9b0f54a 100644
--- a/chart/templates/deployment-celery-worker.yaml
+++ b/chart/templates/deployment-celery-worker.yaml
@@ -66,7 +66,7 @@ spec:
                 key: password
           {{end}}
           - name: POSTGRES_USER
-            value: "postgres"
+            value: "{{ .Values.postgresql.dbUser }}"
           - name: REDIS_PASSWORD
             valueFrom:
               secretKeyRef:
diff --git a/chart/templates/deployment-django.yaml b/chart/templates/deployment-django.yaml
index 8ba38487b59694058f813a9f1c80f2ac575d839d..aa3d3588576914799131397507f845b684bb7b47 100644
--- a/chart/templates/deployment-django.yaml
+++ b/chart/templates/deployment-django.yaml
@@ -65,7 +65,7 @@ spec:
                 key: password
           {{end}}
           - name: POSTGRES_USER
-            value: "postgres"
+            value: "{{ .Values.postgresql.dbUser }}"
           - name: REDIS_PASSWORD
             valueFrom:
               secretKeyRef:
diff --git a/chart/templates/deployment-postgres.yaml b/chart/templates/deployment-postgres.yaml
index 43541f5537248bb349de69d5dc848aeff8e1322b..6994bc712b310830a7307a46ebbebc2e41867d57 100644
--- a/chart/templates/deployment-postgres.yaml
+++ b/chart/templates/deployment-postgres.yaml
@@ -10,19 +10,22 @@ spec:
   dockerImage: {{ .Values.postgresql.image }}:{{ .Values.postgresql.tag }}
   teamId: {{ .Release.Name }}
   numberOfInstances: 1
-  users:  # Application/Robot users
+  users:
     {{ .Values.postgresql.dbUser }}: []
   databases:
     {{ .Values.postgresql.dbName }}: {{ .Values.postgresql.dbUser }}
   {{- if .Values.postgresql.preparedDatabases }}
   preparedDatabases:
     {{ .Values.postgresql.dbName }}:
-      defaultUsers: false
+    defaultUsers: false
+    schemas:
+      public:
+        defaultRoles: true
+        defaultUsers: {{ .Values.postgresql.defaultUsers }}
     {{- with .Values.postgresql.preparedDatabases.extensions }}
     extensions:
     {{- toYaml . | nindent 8 }}
     {{- end }}
-    schemas: {}
   {{ end }}
   postgresql:
     version: {{ .Values.postgresql.version | quote }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 14d61b3df62a9ab7a8764715d3b1759645fdd64d..aab86be175a5598e0955ddb8205d91e26707360f 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -112,8 +112,8 @@ postgresql:
   image: registry.opensource.zalan.do/acid/spilo-14
   tag: 2.1-p3
   teamId: ippidb
-  dbUser: postgres
-  dbName: postgres
+  dbUser: ippidp_user
+  dbName: ippidp_user
   version: 14
 #  preparedDatabases:
 #    extensions: {}