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