diff --git a/templates/nextcloud-mariadb-initdbscripts.yaml b/templates/nextcloud-mariadb-initdbscripts.yaml
index 21ef4d18297aa524243a8524fd2cb98f6af3a4e7..ab6a1f03ebae67a0ee51c0fafdc0d51619bf6f54 100644
--- a/templates/nextcloud-mariadb-initdbscripts.yaml
+++ b/templates/nextcloud-mariadb-initdbscripts.yaml
@@ -4,6 +4,6 @@ metadata:
   name: "nextcloud-mariadb-initdbscripts"
 data:
   setup.sql: |
-    CREATE USER onlyoffice IDENTIFIED BY '{{ .Values.onlyoffice.database.password }}';
-    CREATE DATABASE onlyoffice;
-    GRANT ALL PRIVILEGES ON onlyoffice.* TO onlyoffice;
+    CREATE USER {{ .Values.onlyoffice.database.user }} IDENTIFIED BY '{{ .Values.onlyoffice.database.password }}';
+    CREATE DATABASE {{ .Values.onlyoffice.database.name }};
+    GRANT ALL PRIVILEGES ON {{ .Values.onlyoffice.database.name }}.* TO '{{ .Values.onlyoffice.database.user }}'.'%';