diff --git a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
index 115bc3f1a7ba05f424d804890ef06699a64e465e..4d865b0322965beed9fefa506505ec2bc1d5bcc7 100644
--- a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
+++ b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
@@ -87,10 +87,12 @@ data:
 
       # Enable and configure MariaDB chart
       mariadb:
-        db:
+        auth:
           password: "${nextcloud_mariadb_password}"
+          rootPassword: "${nextcloud_mariadb_root_password}"
         enabled: true
-        master:
+        architecture: standalone
+        primary:
           annotations:
             # Let the backup system include nextcloud database data.
             backup.velero.io/backup-volumes: "data"
@@ -105,10 +107,6 @@ data:
             requests:
               cpu: 100m
               memory: 256Mi
-        replication:
-          enabled: false
-        rootUser:
-          password: "${nextcloud_mariadb_root_password}"
 
     apps:
       - name: sociallogin
@@ -165,7 +163,7 @@ data:
         existingClaim: "nextcloud-postgresql"
 
     rabbitmq:
-      rabbitmq:
+      auth:
         password: "${onlyoffice_rabbitmq_password}"
       persistence:
         enabled: false
@@ -181,8 +179,7 @@ data:
         failureThreshold: 10
 
     redis:
-      cluster:
-        enabled: false
+      architecture: standalone
       master:
         persistence:
           enabled: false
@@ -193,6 +190,12 @@ data:
           requests:
             cpu: 50m
             memory: 32Mi
+      commonConfiguration: |-
+        # Disable appendonly type persistence, because we don't need any
+        # persistence for onlyoffice's redis.
+        appendonly no
+        # Disable RDB persistence, for the same reason.
+        save ""
 
     sociallogin:
       server_name: "sso.${domain}"
diff --git a/flux2/infrastructure/sources/nextcloud.yaml b/flux2/infrastructure/sources/nextcloud.yaml
index 73aca893dac6ce8b8ede08ccb9266641d56aec24..181face9e579786db4a19b9454f336b48664ae05 100644
--- a/flux2/infrastructure/sources/nextcloud.yaml
+++ b/flux2/infrastructure/sources/nextcloud.yaml
@@ -14,4 +14,4 @@ spec:
   # For all available options, see:
   # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
   ref:
-    tag: 0.3.3
+    tag: 0.4.0