diff --git a/charts/nextcloud/1.6.15/templates/postgres-secret.yaml b/charts/nextcloud/1.6.15/templates/postgres-secret.yaml
index 2a017f922a..48eb695f09 100644
--- a/charts/nextcloud/1.6.15/templates/postgres-secret.yaml
+++ b/charts/nextcloud/1.6.15/templates/postgres-secret.yaml
@@ -4,7 +4,7 @@ kind: Secret
 metadata:
   name: {{ $secretName }}
 data:
-  db-user: {{ "postgres" | b64enc }}
+  db-user: {{ (include "postgres.DatabaseName" .Values ) | b64enc }}
   {{ with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
   db-password: {{ index .data "db-password" }}
   {{ else }}
diff --git a/test/nextcloud/1.6.15/templates/postgres-secret.yaml b/test/nextcloud/1.6.15/templates/postgres-secret.yaml
index 2a017f922a..48eb695f09 100644
--- a/test/nextcloud/1.6.15/templates/postgres-secret.yaml
+++ b/test/nextcloud/1.6.15/templates/postgres-secret.yaml
@@ -4,7 +4,7 @@ kind: Secret
 metadata:
   name: {{ $secretName }}
 data:
-  db-user: {{ "postgres" | b64enc }}
+  db-user: {{ (include "postgres.DatabaseName" .Values ) | b64enc }}
   {{ with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
   db-password: {{ index .data "db-password" }}
   {{ else }}