diff --git a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
index ae60f00430ce79570ee3f8449a9d40d1dd759ff8..0292c4fed1f095060434d3f7d466ea78a631e070 100644
--- a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
+++ b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
@@ -91,7 +91,7 @@ data:
             # Let the backup system include nextcloud database data.
             backup.velero.io/backup-volumes: "data"
           persistence:
-            ## Enable PostgreSQL persistence using Persistent Volume Claims.
+            ## Enable mariadb persistence using Persistent Volume Claims.
             enabled: true
             existingClaim: "nextcloud-mariadb"
           resources:
@@ -147,6 +147,8 @@ data:
       persistence:
         enabled: true
         existingClaim: "nextcloud-onlyoffice-data"
+      database:
+        password: "${onlyoffice_database_password}"
       deploymentLabels:
         stackspin.net/backupSet: "nextcloud"
       podLabels:
@@ -154,24 +156,6 @@ data:
       podAnnotations:
         backup.velero.io/backup-volumes: "onlyoffice-data"
 
-    postgresql:
-      postgresqlPassword: "${onlyoffice_postgresql_password}"
-      resources:
-        limits:
-          cpu: 400m
-          memory: 256Mi
-        requests:
-          cpu: 200m
-          memory: 128Mi
-      persistence:
-        enabled: true
-        existingClaim: "nextcloud-postgresql"
-      primary:
-        podAnnotations:
-          backup.velero.io/backup-volumes: "data"
-      commonLabels:
-        stackspin.net/backupSet: "nextcloud"
-
     rabbitmq:
       auth:
         password: "${onlyoffice_rabbitmq_password}"
diff --git a/flux2/apps/nextcloud/pvc.yaml b/flux2/apps/nextcloud/pvc.yaml
index c64feb121c5909f076768c116903f5e1b68a50e4..885b91c7c202d588c3c5918ba42b2542aa795595 100644
--- a/flux2/apps/nextcloud/pvc.yaml
+++ b/flux2/apps/nextcloud/pvc.yaml
@@ -33,22 +33,6 @@ spec:
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
-metadata:
-  name: nextcloud-postgresql
-  namespace: stackspin-apps
-  labels:
-    stackspin.net/backupSet: "nextcloud"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  volumeMode: Filesystem
-  resources:
-    requests:
-      storage: 512Mi
-  storageClassName: local-path
----
-apiVersion: v1
-kind: PersistentVolumeClaim
 metadata:
   name: nextcloud-onlyoffice-data
   namespace: stackspin-apps
diff --git a/flux2/apps/nextcloud/release.yaml b/flux2/apps/nextcloud/release.yaml
index e9e3e7de92270df37b124cb18fd6cd0efa00bec0..ce8dfa09d242e4fa24b1ff54c9d61a536e57e75c 100644
--- a/flux2/apps/nextcloud/release.yaml
+++ b/flux2/apps/nextcloud/release.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       # renovate: registryUrl=https://open.greenhost.net/api/v4/projects/1/packages/helm/stable
       chart: nextcloud-onlyoffice
-      version: 0.6.7
+      version: 0.7.0
       sourceRef:
         kind: HelmRepository
         name: nextcloud
diff --git a/install/templates/stackspin-nextcloud-variables.yaml.jinja b/install/templates/stackspin-nextcloud-variables.yaml.jinja
index 59adddfcfb98bf4116bfec9a124c8f45e94ebc50..824749fd54bd988525f3b8cccdc346079971ec7a 100644
--- a/install/templates/stackspin-nextcloud-variables.yaml.jinja
+++ b/install/templates/stackspin-nextcloud-variables.yaml.jinja
@@ -7,6 +7,6 @@ data:
   nextcloud_password: "{{ 32 | generate_password | b64encode }}"
   nextcloud_mariadb_password: "{{ 32 | generate_password | b64encode }}"
   nextcloud_mariadb_root_password: "{{ 32 | generate_password | b64encode }}"
+  onlyoffice_database_password: "{{ 32 | generate_password | b64encode }}"
   onlyoffice_jwt_secret: "{{ 32 | generate_password | b64encode }}"
-  onlyoffice_postgresql_password: "{{ 32 | generate_password | b64encode }}"
   onlyoffice_rabbitmq_password: "{{ 32 | generate_password | b64encode }}"
diff --git a/stackspin/cluster.py b/stackspin/cluster.py
index 583739249e14ff4222eb415396a3a242b2150cea..43ff7ef1cc6748a9a57f89955d84aa9798470c1e 100644
--- a/stackspin/cluster.py
+++ b/stackspin/cluster.py
@@ -206,7 +206,7 @@ KUBECONFIG={cluster_dir}/kube_config_cluster.yml
                     'nextcloud_mariadb_root_password',
                     'nextcloud_password',
                     'onlyoffice_jwt_secret',
-                    'onlyoffice_postgresql_password',
+                    'onlyoffice_database_password',
                     'onlyoffice_rabbitmq_password'],
                 'stackspin-single-sign-on-variables': [
                     'userbackend_admin_password',