diff --git a/k8s-wheatley/plex/kustomization.yaml b/k8s-wheatley/plex/kustomization.yaml
index ac6f6a4..3bd4023 100644
--- a/k8s-wheatley/plex/kustomization.yaml
+++ b/k8s-wheatley/plex/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Kustomization
 namespace: plex
 
 resources:
-  - ../datastore/pvc.yaml
+  - ../../kustomize-bases/nfs-media
   - configmap.yaml
   - deployments.yaml
   - ingress.yaml
@@ -36,5 +36,5 @@ patches:
         value: ReadOnlyMany
 
 images:
-  - name: plexinc/pms-docker
-    newTag: 1.43.1.10611-1e34174b1@sha256:8b5bcdf7b506fe051aa1a0a0d464efdb3ad8c0fb1f8a4dfb27a8c489b609920c
+- name: plexinc/pms-docker
+  newTag: 1.43.1.10611-1e34174b1@sha256:8b5bcdf7b506fe051aa1a0a0d464efdb3ad8c0fb1f8a4dfb27a8c489b609920c
diff --git a/k8s-wheatley/qbittorrent/kustomization.yaml b/k8s-wheatley/qbittorrent/kustomization.yaml
index 9582f02..68bd0ef 100644
--- a/k8s-wheatley/qbittorrent/kustomization.yaml
+++ b/k8s-wheatley/qbittorrent/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Kustomization
 namespace: qbittorrent
 
 resources:
-  - ../datastore/pvc.yaml
+  - ../../kustomize-bases/nfs-media
   - configmap.yaml
   - deployments.yaml
   - ingress.yaml
diff --git a/k8s-wheatley/radarr/kustomization.yaml b/k8s-wheatley/radarr/kustomization.yaml
index e938840..445d2f3 100644
--- a/k8s-wheatley/radarr/kustomization.yaml
+++ b/k8s-wheatley/radarr/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Kustomization
 namespace: radarr
 
 resources:
-  - ../datastore/pvc.yaml
+  - ../../kustomize-bases/nfs-media
   - configmap.yaml
   - deployments.yaml
   - ingress.yaml
diff --git a/k8s-wheatley/sonarr/kustomization.yaml b/k8s-wheatley/sonarr/kustomization.yaml
index ad5d4f6..51ba92b 100644
--- a/k8s-wheatley/sonarr/kustomization.yaml
+++ b/k8s-wheatley/sonarr/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Kustomization
 namespace: sonarr
 
 resources:
-  - ../datastore/pvc.yaml
+  - ../../kustomize-bases/nfs-media
   - configmap.yaml
   - deployments.yaml
   - ingress.yaml
diff --git a/kustomize-bases/nfs-media/kustomization.yaml b/kustomize-bases/nfs-media/kustomization.yaml
new file mode 100644
index 0000000..482f897
--- /dev/null
+++ b/kustomize-bases/nfs-media/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - pvc.yaml
diff --git a/k8s-wheatley/datastore/pvc.yaml b/kustomize-bases/nfs-media/pvc.yaml
similarity index 89%
rename from k8s-wheatley/datastore/pvc.yaml
rename to kustomize-bases/nfs-media/pvc.yaml
index 7d43e93..94091c9 100644
--- a/k8s-wheatley/datastore/pvc.yaml
+++ b/kustomize-bases/nfs-media/pvc.yaml
@@ -9,7 +9,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: nfs-media
+  name: nfs-media  # renamed per-app via JSON patch
 spec:
   capacity:
     storage: 40Ti
@@ -37,4 +37,4 @@ spec:
   resources:
     requests:
       storage: 40Ti
-  volumeName: nfs-media
+  volumeName: nfs-media  # patched per-app to match PV name