diff --git a/services/nextcloud/configmap.yaml b/services/nextcloud/configmap.yaml
index c49a7b4..20d2273 100644
--- a/services/nextcloud/configmap.yaml
+++ b/services/nextcloud/configmap.yaml
@@ -25,6 +25,7 @@ data:
       'mail_smtpauthtype' => 'LOGIN',
       'mail_domain' => 'bstein.dev',
       'mail_from_address' => 'no-reply',
+      'datadirectory' => '/var/www/html/data',
       'apps_paths' =>
       array (
         0 =>
diff --git a/services/nextcloud/cronjob.yaml b/services/nextcloud/cronjob.yaml
index 86c55e1..7900bb1 100644
--- a/services/nextcloud/cronjob.yaml
+++ b/services/nextcloud/cronjob.yaml
@@ -24,9 +24,14 @@ spec:
               args:
                 - "cd /var/www/html && php -f cron.php"
               volumeMounts:
-                - name: nextcloud-data
+                - name: nextcloud-app
                   mountPath: /var/www/html
+                - name: nextcloud-user-data
+                  mountPath: /var/www/html/data
           volumes:
-            - name: nextcloud-data
+            - name: nextcloud-app
               persistentVolumeClaim:
-                claimName: nextcloud-data
+                claimName: nextcloud-app
+            - name: nextcloud-user-data
+              persistentVolumeClaim:
+                claimName: nextcloud-user-data
diff --git a/services/nextcloud/deployment.yaml b/services/nextcloud/deployment.yaml
index d2f7429..c88e882 100644
--- a/services/nextcloud/deployment.yaml
+++ b/services/nextcloud/deployment.yaml
@@ -42,8 +42,10 @@ spec:
             runAsUser: 0
             runAsGroup: 0
           volumeMounts:
-            - name: nextcloud-data
+            - name: nextcloud-app
               mountPath: /var/www/html
+            - name: nextcloud-user-data
+              mountPath: /var/www/html/data
             - name: nextcloud-config
               mountPath: /var/www/html/config/extra.config.php
               subPath: extra.config.php
@@ -139,8 +141,10 @@ spec:
                   name: nextcloud-oidc
                   key: client-secret
           volumeMounts:
-            - name: nextcloud-data
+            - name: nextcloud-app
               mountPath: /var/www/html
+            - name: nextcloud-user-data
+              mountPath: /var/www/html/data
             - name: nextcloud-config
               mountPath: /var/www/html/config/extra.config.php
               subPath: extra.config.php
@@ -226,12 +230,14 @@ spec:
             - containerPort: 80
               name: http
           volumeMounts:
-            - name: nextcloud-data
+            - name: nextcloud-app
               mountPath: /var/www/html
+            - name: nextcloud-user-data
+              mountPath: /var/www/html/data
             - name: nextcloud-config
               mountPath: /var/www/html/config/extra.config.php
               subPath: extra.config.php
-      resources:
+          resources:
             requests:
               cpu: 250m
               memory: 1Gi
@@ -239,9 +245,12 @@ spec:
               cpu: 1
               memory: 3Gi
       volumes:
-        - name: nextcloud-data
+        - name: nextcloud-app
           persistentVolumeClaim:
-            claimName: nextcloud-data
+            claimName: nextcloud-app
+        - name: nextcloud-user-data
+          persistentVolumeClaim:
+            claimName: nextcloud-user-data
         - name: nextcloud-config
           configMap:
             name: nextcloud-config
diff --git a/services/nextcloud/maintenance-cronjob.yaml b/services/nextcloud/maintenance-cronjob.yaml
index 55fcbd1..c9421dd 100644
--- a/services/nextcloud/maintenance-cronjob.yaml
+++ b/services/nextcloud/maintenance-cronjob.yaml
@@ -34,8 +34,10 @@ spec:
                       name: nextcloud-admin
                       key: admin-password
               volumeMounts:
-                - name: nextcloud-data
+                - name: nextcloud-app
                   mountPath: /var/www/html
+                - name: nextcloud-user-data
+                  mountPath: /var/www/html/data
                 - name: maintenance-script
                   mountPath: /maintenance/maintenance.sh
                   subPath: maintenance.sh
@@ -47,9 +49,12 @@ spec:
                   cpu: 500m
                   memory: 512Mi
           volumes:
-            - name: nextcloud-data
+            - name: nextcloud-app
               persistentVolumeClaim:
-                claimName: nextcloud-data
+                claimName: nextcloud-app
+            - name: nextcloud-user-data
+              persistentVolumeClaim:
+                claimName: nextcloud-user-data
             - name: maintenance-script
               configMap:
                 name: nextcloud-maintenance-script