diff --git a/services/nextcloud-mail-sync/cronjob.yaml b/services/nextcloud-mail-sync/cronjob.yaml
index e0705c56..9976d8e1 100644
--- a/services/nextcloud-mail-sync/cronjob.yaml
+++ b/services/nextcloud-mail-sync/cronjob.yaml
@@ -80,16 +80,16 @@ spec:
           volumes:
             - name: nextcloud-config-pvc
               persistentVolumeClaim:
-                claimName: nextcloud-config
+                claimName: nextcloud-config-v2
             - name: nextcloud-custom-apps
               persistentVolumeClaim:
-                claimName: nextcloud-custom-apps
+                claimName: nextcloud-custom-apps-v2
             - name: nextcloud-user-data
               persistentVolumeClaim:
-                claimName: nextcloud-user-data
+                claimName: nextcloud-user-data-v2
             - name: nextcloud-web
               persistentVolumeClaim:
-                claimName: nextcloud-web
+                claimName: nextcloud-web-v2
             - name: sync-script
               configMap:
                 name: nextcloud-mail-sync-script
diff --git a/services/nextcloud/cronjob.yaml b/services/nextcloud/cronjob.yaml
index 721a4940..cc0091bc 100644
--- a/services/nextcloud/cronjob.yaml
+++ b/services/nextcloud/cronjob.yaml
@@ -35,13 +35,13 @@ spec:
           volumes:
             - name: nextcloud-config-pvc
               persistentVolumeClaim:
-                claimName: nextcloud-config
+                claimName: nextcloud-config-v2
             - name: nextcloud-custom-apps
               persistentVolumeClaim:
-                claimName: nextcloud-custom-apps
+                claimName: nextcloud-custom-apps-v2
             - name: nextcloud-user-data
               persistentVolumeClaim:
-                claimName: nextcloud-user-data
+                claimName: nextcloud-user-data-v2
             - name: nextcloud-web
               persistentVolumeClaim:
-                claimName: nextcloud-web
+                claimName: nextcloud-web-v2
diff --git a/services/nextcloud/deployment.yaml b/services/nextcloud/deployment.yaml
index 0d34e457..295435e3 100644
--- a/services/nextcloud/deployment.yaml
+++ b/services/nextcloud/deployment.yaml
@@ -300,16 +300,16 @@ spec:
       volumes:
         - name: nextcloud-web
           persistentVolumeClaim:
-            claimName: nextcloud-web
+            claimName: nextcloud-web-v2
         - name: nextcloud-config-pvc
           persistentVolumeClaim:
-            claimName: nextcloud-config
+            claimName: nextcloud-config-v2
         - name: nextcloud-custom-apps
           persistentVolumeClaim:
-            claimName: nextcloud-custom-apps
+            claimName: nextcloud-custom-apps-v2
         - name: nextcloud-user-data
           persistentVolumeClaim:
-            claimName: nextcloud-user-data
+            claimName: nextcloud-user-data-v2
         - name: nextcloud-config-extra
           configMap:
             name: nextcloud-config
diff --git a/services/nextcloud/maintenance-cronjob.yaml b/services/nextcloud/maintenance-cronjob.yaml
index a6fad0a9..618f5484 100644
--- a/services/nextcloud/maintenance-cronjob.yaml
+++ b/services/nextcloud/maintenance-cronjob.yaml
@@ -55,16 +55,16 @@ spec:
           volumes:
             - name: nextcloud-config-pvc
               persistentVolumeClaim:
-                claimName: nextcloud-config
+                claimName: nextcloud-config-v2
             - name: nextcloud-custom-apps
               persistentVolumeClaim:
-                claimName: nextcloud-custom-apps
+                claimName: nextcloud-custom-apps-v2
             - name: nextcloud-user-data
               persistentVolumeClaim:
-                claimName: nextcloud-user-data
+                claimName: nextcloud-user-data-v2
             - name: nextcloud-web
               persistentVolumeClaim:
-                claimName: nextcloud-web
+                claimName: nextcloud-web-v2
             - name: maintenance-script
               configMap:
                 name: nextcloud-maintenance-script
diff --git a/services/nextcloud/pvc.yaml b/services/nextcloud/pvc.yaml
index a9347329..c0779efe 100644
--- a/services/nextcloud/pvc.yaml
+++ b/services/nextcloud/pvc.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: nextcloud-config
+  name: nextcloud-config-v2
   namespace: nextcloud
 spec:
   accessModes:
@@ -15,7 +15,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: nextcloud-custom-apps
+  name: nextcloud-custom-apps-v2
   namespace: nextcloud
 spec:
   accessModes:
@@ -28,7 +28,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: nextcloud-web
+  name: nextcloud-web-v2
   namespace: nextcloud
 spec:
   accessModes:
@@ -41,7 +41,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: nextcloud-user-data
+  name: nextcloud-user-data-v2
   namespace: nextcloud
 spec:
   accessModes:
@@ -50,4 +50,3 @@ spec:
     requests:
       storage: 2Ti
   storageClassName: asteria
-  volumeName: pvc-d918158d-422f-4928-beaa-27862611fbe5