diff --git a/templates/nextcloud-mariadb-initdbscripts.yaml b/templates/nextcloud-mariadb-initdbscripts.yaml
deleted file mode 100644
index 8045598ed2e5fe4778be94441cc4053ad9ff08df..0000000000000000000000000000000000000000
--- a/templates/nextcloud-mariadb-initdbscripts.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: "nextcloud-mariadb-initdbscripts"
-data:
-  setup.sql: |
-    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 }}'@'%';
diff --git a/templates/onlyoffice-database-secret.yaml b/templates/onlyoffice-database-secret.yaml
index e78edcbb4e6fc102d6957a668195ca9e40ec3e6f..eb2f9222f003d0247fc30c7c93c35ae9f55a06d8 100644
--- a/templates/onlyoffice-database-secret.yaml
+++ b/templates/onlyoffice-database-secret.yaml
@@ -4,4 +4,4 @@ type: Opaque
 metadata:
   name: "{{ .Release.Name }}-onlyoffice-database"
 stringData:
-  database-password: "{{ .Values.onlyoffice.database.password }}"
+  database-password: "{{ .Values.global.onlyofficeDb.password }}"
diff --git a/templates/onlyoffice-deployment.yaml b/templates/onlyoffice-deployment.yaml
index cf1413d724d371f36bcf48f4e967f24e186fa1f6..ab6e3e3723cb8cd3e74dbb7edb3f752d5906512e 100644
--- a/templates/onlyoffice-deployment.yaml
+++ b/templates/onlyoffice-deployment.yaml
@@ -85,18 +85,18 @@ spec:
             - name: DB_TYPE
               value: "mariadb"
             - name: DB_USER
-              value: "{{ .Values.onlyoffice.database.user }}"
+              value: "{{ .Values.global.onlyofficeDb.user }}"
             - name: DB_PWD
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Release.Name }}-onlyoffice-database"
                   key: "database-password"
             - name: DB_HOST
-              value: {{ .Values.onlyoffice.database.host | default (printf "%s-mariadb" .Release.Name) }}
+              value: {{ .Values.global.onlyofficeDb.host | default (printf "%s-mariadb" .Release.Name) }}
             - name: DB_PORT
-              value: "{{ .Values.onlyoffice.database.port }}"
+              value: "{{ .Values.global.onlyofficeDb.port }}"
             - name: DB_NAME
-              value: "{{ .Values.onlyoffice.database.name }}"
+              value: "{{ .Values.global.onlyofficeDb.name }}"
             - name: REDIS_SERVER_HOST
               value: "{{ .Release.Name }}-redis-master"
             - name: REDIS_SERVER_PORT
diff --git a/values-local.yaml.example b/values-local.yaml.example
index e2814d79d70f66eeb580053881e15a90b75ec784..070062e667ecb7464a8ea4683edf1fd4b2e04733 100644
--- a/values-local.yaml.example
+++ b/values-local.yaml.example
@@ -38,6 +38,10 @@ nextcloud:
   #   enabled: true
   #   size: 2Gi
 
+global:
+  onlyofficeDb:
+    password: CHANGE_ME
+
 onlyoffice:
   server_name: "office.your.domain"
   jwtSecret: CHANGE_ME
@@ -49,8 +53,6 @@ onlyoffice:
       - hosts:
           - "office.your.domain"
         secretName: office-cert
-  database:
-    password: CHANGE_ME
 
 rabbitmq:
   auth:
diff --git a/values.yaml b/values.yaml
index da811d2e4d0d3895e4b95107452ab2f1923c36a3..bf6e26e40f164e5ea15033801cc53efaf3323e41 100644
--- a/values.yaml
+++ b/values.yaml
@@ -13,7 +13,12 @@ nextcloud:
     volumePermissions:
       image:
         pullSecrets: []
-    initdbScriptsConfigMap: "nextcloud-mariadb-initdbscripts"
+    # initdbScriptsConfigMap: "nextcloud-mariadb-initdbscripts"
+    initdbScripts:
+      setup.sql: |
+        CREATE USER {{ .Values.global.onlyofficeDb.user }} IDENTIFIED BY '{{ .Values.global.onlyofficeDb.password }}';
+        CREATE DATABASE {{ .Values.global.onlyofficeDb.name }};
+        GRANT ALL PRIVILEGES ON {{ .Values.global.onlyofficeDb.name }}.* TO '{{ .Values.global.onlyofficeDb.user }}'@'%';
 
   # Use 2 GB of storage for NC storage (maybe make configurable later?)
   persistence:
@@ -43,6 +48,15 @@ setupApps:
 mariadb:
   enabled: true
 
+global:
+  onlyofficeDb:
+    # `host` defaults to "{{ .Release.Name }}-mariadb"
+    name: onlyoffice
+    port: 3306
+    user: onlyoffice
+    # password:
+
+
 onlyoffice:
   # Default values for onlyoffice.
 
@@ -102,12 +116,6 @@ onlyoffice:
     accessMode: ReadWriteOnce
     size: 2Gi
 
-  database:
-    # `host` defaults to "{{ .Release.Name }}-mariadb"
-    name: onlyoffice
-    port: 3306
-    user: onlyoffice
-    # password:
 
   nameOverride: ''
   fullnameOverride: ''