diff --git a/kubernetes/apps/downloads/bazarr/app/helmrelease.yaml b/kubernetes/apps/downloads/bazarr/app/helmrelease.yaml
index bf8df1f7e..0c958f8bb 100644
--- a/kubernetes/apps/downloads/bazarr/app/helmrelease.yaml
+++ b/kubernetes/apps/downloads/bazarr/app/helmrelease.yaml
@@ -111,6 +111,6 @@ spec:
         existingClaim: ${VOLSYNC_CLAIM}
       media:
         enabled: true
-        existingClaim: downloads-datastore
+        existingClaim: downloads-pvc
         globalMounts:
           - path: /media
diff --git a/kubernetes/apps/selfhosted/pvc/kustomization.yaml b/kubernetes/apps/downloads/downloads-pvc/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/selfhosted/pvc/kustomization.yaml
rename to kubernetes/apps/downloads/downloads-pvc/app/kustomization.yaml
diff --git a/kubernetes/apps/downloads/pvc/downloads-pvc.yaml b/kubernetes/apps/downloads/downloads-pvc/app/media-pvc.yaml
similarity index 83%
rename from kubernetes/apps/downloads/pvc/downloads-pvc.yaml
rename to kubernetes/apps/downloads/downloads-pvc/app/media-pvc.yaml
index 31c24c9bc..0bee88e74 100644
--- a/kubernetes/apps/downloads/pvc/downloads-pvc.yaml
+++ b/kubernetes/apps/downloads/downloads-pvc/app/media-pvc.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: downloads-datastore
+  name: downloads-pvc
 spec:
   capacity:
     storage: 4000Gi
@@ -18,8 +18,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: downloads-datastore
-  namespace: downloads
+  name: downloads-pvc
 spec:
   accessModes: ["ReadWriteMany"]
   resources:
@@ -27,4 +26,4 @@ spec:
       storage: 4000Gi
   storageClassName: nfs
   volumeMode: Filesystem
-  volumeName: downloads-datastore
+  volumeName: downloads-pvc
diff --git a/kubernetes/apps/downloads/downloads-pvc/ks.yaml b/kubernetes/apps/downloads/downloads-pvc/ks.yaml
new file mode 100644
index 000000000..a7988117a
--- /dev/null
+++ b/kubernetes/apps/downloads/downloads-pvc/ks.yaml
@@ -0,0 +1,20 @@
+---
+# yaml-language-server: $schema=https://crd.movishell.pl/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app downloads-pvc
+  namespace: &namespace downloads
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  interval: 30m
+  path: ./kubernetes/apps/downloads/downloads-pvc/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: homelab-ops
+    namespace: flux-system
+  targetNamespace: *namespace
+  wait: true
diff --git a/kubernetes/apps/downloads/kustomization.yaml b/kubernetes/apps/downloads/kustomization.yaml
index 50bbd6508..b85956252 100644
--- a/kubernetes/apps/downloads/kustomization.yaml
+++ b/kubernetes/apps/downloads/kustomization.yaml
@@ -10,9 +10,9 @@ components:
   - ../../components/sops
 resources:
   - ./bazarr/ks.yaml
+  - ./downloads-pvc/ks.yaml
   - ./lidarr/ks.yaml
   - ./prowlarr/ks.yaml
-  - ./pvc
   - ./qbittorrent/ks.yaml
   - ./radarr/ks.yaml
   - ./recyclarr/ks.yaml
diff --git a/kubernetes/apps/downloads/lidarr/app/helmrelease.yaml b/kubernetes/apps/downloads/lidarr/app/helmrelease.yaml
index 52d198dbb..5dba866af 100644
--- a/kubernetes/apps/downloads/lidarr/app/helmrelease.yaml
+++ b/kubernetes/apps/downloads/lidarr/app/helmrelease.yaml
@@ -122,6 +122,6 @@ spec:
         globalMounts:
           - path: /config/logs
       media:
-        existingClaim: downloads-datastore
+        existingClaim: downloads-pvc
         globalMounts:
           - path: /media
diff --git a/kubernetes/apps/downloads/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/downloads/qbittorrent/app/helmrelease.yaml
index 2b5ba4902..87da9806f 100644
--- a/kubernetes/apps/downloads/qbittorrent/app/helmrelease.yaml
+++ b/kubernetes/apps/downloads/qbittorrent/app/helmrelease.yaml
@@ -142,7 +142,7 @@ spec:
       config:
         existingClaim: ${VOLSYNC_CLAIM}
       downloads:
-        existingClaim: downloads-datastore
+        existingClaim: downloads-pvc
         globalMounts:
           - path: /downloads
             subPath: Downloads
diff --git a/kubernetes/apps/downloads/radarr/app/helmrelease.yaml b/kubernetes/apps/downloads/radarr/app/helmrelease.yaml
index 7609e0ce0..26b1ea037 100644
--- a/kubernetes/apps/downloads/radarr/app/helmrelease.yaml
+++ b/kubernetes/apps/downloads/radarr/app/helmrelease.yaml
@@ -119,7 +119,7 @@ spec:
         globalMounts:
           - path: /config/logs
       media:
-        existingClaim: downloads-datastore
+        existingClaim: downloads-pvc
         globalMounts:
           - path: /media
       tmp:
diff --git a/kubernetes/apps/downloads/sonarr/app/helmrelease.yaml b/kubernetes/apps/downloads/sonarr/app/helmrelease.yaml
index 0d95f7906..a4f7c8bbc 100644
--- a/kubernetes/apps/downloads/sonarr/app/helmrelease.yaml
+++ b/kubernetes/apps/downloads/sonarr/app/helmrelease.yaml
@@ -120,7 +120,7 @@ spec:
         globalMounts:
           - path: /config/logs
       media:
-        existingClaim: downloads-datastore
+        existingClaim: downloads-pvc
         globalMounts:
           - path: /media
       tmp:
diff --git a/kubernetes/apps/selfhosted/audiobookshelf/app/helmrelease.yaml b/kubernetes/apps/selfhosted/audiobookshelf/app/helmrelease.yaml
index 1394369b5..67d3e276e 100644
--- a/kubernetes/apps/selfhosted/audiobookshelf/app/helmrelease.yaml
+++ b/kubernetes/apps/selfhosted/audiobookshelf/app/helmrelease.yaml
@@ -86,7 +86,7 @@ spec:
       config:
         existingClaim: ${VOLSYNC_CLAIM}
       media:
-        existingClaim: media-datastore
+        existingClaim: selfhosted-pvc
         globalMounts:
           - path: /audiobooks
             subPath: Audiobooks
diff --git a/kubernetes/apps/selfhosted/kustomization.yaml b/kubernetes/apps/selfhosted/kustomization.yaml
index 86d12b9d1..d9580e2f3 100644
--- a/kubernetes/apps/selfhosted/kustomization.yaml
+++ b/kubernetes/apps/selfhosted/kustomization.yaml
@@ -17,4 +17,4 @@ resources:
   - ./nextcloud/ks.yaml
   - ./paperless/ks.yaml
   - ./partdb/ks.yaml
-  - ./pvc
+  - ./selfhosted-pvc
diff --git a/kubernetes/apps/selfhosted/navidrome/app/helmrelease.yaml b/kubernetes/apps/selfhosted/navidrome/app/helmrelease.yaml
index 7d521d19a..a278e0854 100644
--- a/kubernetes/apps/selfhosted/navidrome/app/helmrelease.yaml
+++ b/kubernetes/apps/selfhosted/navidrome/app/helmrelease.yaml
@@ -95,7 +95,7 @@ spec:
       config:
         existingClaim: ${VOLSYNC_CLAIM}
       music:
-        existingClaim: media-datastore
+        existingClaim: selfhosted-pvc
         globalMounts:
           - path: /music
             subPath: Music
diff --git a/kubernetes/apps/downloads/pvc/kustomization.yaml b/kubernetes/apps/selfhosted/selfhosted-pvc/app/kustomization.yaml
similarity index 86%
rename from kubernetes/apps/downloads/pvc/kustomization.yaml
rename to kubernetes/apps/selfhosted/selfhosted-pvc/app/kustomization.yaml
index 91a409046..498b30cab 100644
--- a/kubernetes/apps/downloads/pvc/kustomization.yaml
+++ b/kubernetes/apps/selfhosted/selfhosted-pvc/app/kustomization.yaml
@@ -3,4 +3,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./downloads-pvc.yaml
+  - ./media-pvc.yaml
diff --git a/kubernetes/apps/selfhosted/pvc/media-pvc.yaml b/kubernetes/apps/selfhosted/selfhosted-pvc/app/selfhosted-pvc.yaml
similarity index 84%
rename from kubernetes/apps/selfhosted/pvc/media-pvc.yaml
rename to kubernetes/apps/selfhosted/selfhosted-pvc/app/selfhosted-pvc.yaml
index c0426bf04..51f23e3ae 100644
--- a/kubernetes/apps/selfhosted/pvc/media-pvc.yaml
+++ b/kubernetes/apps/selfhosted/selfhosted-pvc/app/selfhosted-pvc.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: media-datastore
+  name: selfhosted-pvc
 spec:
   capacity:
     storage: 4000Gi
@@ -18,8 +18,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: media-datastore
-  namespace: selfhosted
+  name: selfhosted-pvc
 spec:
   accessModes: [ReadWriteMany]
   resources:
@@ -27,4 +26,4 @@ spec:
       storage: 4000Gi
   storageClassName: nfs
   volumeMode: Filesystem
-  volumeName: media-datastore
+  volumeName: selfhosted-pvc
diff --git a/kubernetes/apps/selfhosted/selfhosted-pvc/ks.yaml b/kubernetes/apps/selfhosted/selfhosted-pvc/ks.yaml
new file mode 100644
index 000000000..c6a400916
--- /dev/null
+++ b/kubernetes/apps/selfhosted/selfhosted-pvc/ks.yaml
@@ -0,0 +1,20 @@
+---
+# yaml-language-server: $schema=https://crd.movishell.pl/kustomize.toolkit.fluxcd.io/kustomization_v1.json
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: &app selfhosted-pvc
+  namespace: &namespace selfhosted
+spec:
+  commonMetadata:
+    labels:
+      app.kubernetes.io/name: *app
+  interval: 30m
+  path: ./kubernetes/apps/selfhosted/selfhosted-pvc/app
+  prune: true
+  sourceRef:
+    kind: GitRepository
+    name: homelab-ops
+    namespace: flux-system
+  targetNamespace: *namespace
+  wait: true