diff --git a/apps/prod/ccache-pvc/base/kustomization.yaml b/apps/prod/ccache-pvc/base/kustomization.yaml
deleted file mode 100644
index 9febd7eda..000000000
--- a/apps/prod/ccache-pvc/base/kustomization.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resources:
-- pvc.yaml
diff --git a/apps/prod/ccache-pvc/base/pvc.yaml b/apps/prod/ccache-pvc/base/pvc.yaml
deleted file mode 100644
index 9fbe6c0aa..000000000
--- a/apps/prod/ccache-pvc/base/pvc.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: cargo-home
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 32Gi
-  storageClassName: ceph-filesystem
-  volumeMode: Filesystem
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: ccache-dir
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 64Gi
-  storageClassName: ceph-filesystem
-  volumeMode: Filesystem
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: rustup-home
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 32Gi
-  storageClassName: ceph-filesystem
-  volumeMode: Filesystem
diff --git a/apps/prod/ccache-pvc/kustomization.yaml b/apps/prod/ccache-pvc/kustomization.yaml
deleted file mode 100644
index 575038a91..000000000
--- a/apps/prod/ccache-pvc/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resources:
-- platforms/linux-amd64
-- platforms/linux-arm64
-namespace: jenkins-cd
diff --git a/apps/prod/ccache-pvc/platforms/linux-amd64/kustomization.yaml b/apps/prod/ccache-pvc/platforms/linux-amd64/kustomization.yaml
deleted file mode 100644
index 58d9cd918..000000000
--- a/apps/prod/ccache-pvc/platforms/linux-amd64/kustomization.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resources:
-- ../../base
-namesuffix: "-linux-amd64"
diff --git a/apps/prod/ccache-pvc/platforms/linux-arm64/kustomization.yaml b/apps/prod/ccache-pvc/platforms/linux-arm64/kustomization.yaml
deleted file mode 100644
index d987ee23d..000000000
--- a/apps/prod/ccache-pvc/platforms/linux-arm64/kustomization.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-resources:
-- ../../base
-namesuffix: "-linux-arm64"
diff --git a/apps/prod/jenkins/post/cd/kustomization.yaml b/apps/prod/jenkins/post/cd/kustomization.yaml
index 102c2dd91..4afd85aa0 100644
--- a/apps/prod/jenkins/post/cd/kustomization.yaml
+++ b/apps/prod/jenkins/post/cd/kustomization.yaml
@@ -4,3 +4,4 @@ namespace: jenkins-cd
 resources:
   - namespace.yaml
   - ../_base/rbac.yaml
+  - pvc.yaml
diff --git a/apps/prod/jenkins/post/cd/pvc.yaml b/apps/prod/jenkins/post/cd/pvc.yaml
new file mode 100644
index 000000000..dc7584a05
--- /dev/null
+++ b/apps/prod/jenkins/post/cd/pvc.yaml
@@ -0,0 +1,77 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: cargo-home-linux-amd64
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 32Gi
+  storageClassName: nfs
+  volumeMode: Filesystem
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: cargo-home-linux-arm64
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 32Gi
+  storageClassName: nfs
+  volumeMode: Filesystem
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ccache-dir-linux-amd64
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 64Gi
+  storageClassName: nfs
+  volumeMode: Filesystem
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ccache-dir-linux-arm64
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 64Gi
+  storageClassName: nfs
+  volumeMode: Filesystem
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: rustup-home-linux-amd64
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 32Gi
+  storageClassName: nfs
+  volumeMode: Filesystem
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: rustup-home-linux-arm64
+spec:
+  accessModes:
+  - ReadWriteMany
+  resources:
+    requests:
+      storage: 32Gi
+  storageClassName: nfs
+  volumeMode: Filesystem
diff --git a/apps/prod/kustomization.yaml b/apps/prod/kustomization.yaml
index a7853666a..191c6c6a1 100644
--- a/apps/prod/kustomization.yaml
+++ b/apps/prod/kustomization.yaml
@@ -14,7 +14,6 @@ resources:
   - brc
   - buildbarn
   - prow-worker
-  - ccache-pvc
   - cloudevents-server
   - boskos
   - git-cdn