diff --git a/services/jenkins/cache-pvc.yaml b/services/jenkins/cache-pvc.yaml
new file mode 100644
index 00000000..784c7d8d
--- /dev/null
+++ b/services/jenkins/cache-pvc.yaml
@@ -0,0 +1,13 @@
+# services/jenkins/cache-pvc.yaml
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: jenkins-cache
+  namespace: jenkins
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  storageClassName: astreae
diff --git a/services/jenkins/configmap-jcasc.yaml b/services/jenkins/configmap-jcasc.yaml
index e29c1436..f485de81 100644
--- a/services/jenkins/configmap-jcasc.yaml
+++ b/services/jenkins/configmap-jcasc.yaml
@@ -258,6 +258,11 @@ data:
           templates:
             - name: "default"
               namespace: "jenkins"
+              workspaceVolume:
+                dynamicPVC:
+                  accessModes: "ReadWriteOnce"
+                  requestsSize: "5Gi"
+                  storageClassName: "astreae"
               containers:
               - name: "jnlp"
                 args: "^${computer.jnlpmac} ^${computer.name}"
diff --git a/services/jenkins/deployment.yaml b/services/jenkins/deployment.yaml
index b5b3de63..7ee1aad4 100644
--- a/services/jenkins/deployment.yaml
+++ b/services/jenkins/deployment.yaml
@@ -161,9 +161,11 @@ spec:
           persistentVolumeClaim:
             claimName: jenkins
         - name: jenkins-cache
-          emptyDir: {}
+          persistentVolumeClaim:
+            claimName: jenkins-cache
         - name: plugin-dir
-          emptyDir: {}
+          persistentVolumeClaim:
+            claimName: jenkins-plugins
         - name: plugins
           configMap:
             name: jenkins-plugins
diff --git a/services/jenkins/kustomization.yaml b/services/jenkins/kustomization.yaml
index 0a03f5b5..aab859ab 100644
--- a/services/jenkins/kustomization.yaml
+++ b/services/jenkins/kustomization.yaml
@@ -6,6 +6,8 @@ resources:
   - namespace.yaml
   - serviceaccount.yaml
   - pvc.yaml
+  - cache-pvc.yaml
+  - plugins-pvc.yaml
   - configmap-jcasc.yaml
   - configmap-plugins.yaml
   - deployment.yaml
diff --git a/services/jenkins/plugins-pvc.yaml b/services/jenkins/plugins-pvc.yaml
new file mode 100644
index 00000000..45a967bb
--- /dev/null
+++ b/services/jenkins/plugins-pvc.yaml
@@ -0,0 +1,13 @@
+# services/jenkins/plugins-pvc.yaml
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: jenkins-plugins
+  namespace: jenkins
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 2Gi
+  storageClassName: astreae