diff --git a/infrastructure/helm/templates/pvc-firmware-cache.yaml b/infrastructure/helm/templates/pvc-firmware-cache.yaml
new file mode 100644
index 0000000..7d1d42f
--- /dev/null
+++ b/infrastructure/helm/templates/pvc-firmware-cache.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "tod.fullname" . }}-firmware-cache
+  labels:
+    {{- include "tod.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  {{- if .Values.storage.firmwareCache.storageClass }}
+  storageClassName: {{ .Values.storage.firmwareCache.storageClass | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.storage.firmwareCache.size }}
diff --git a/infrastructure/helm/templates/pvc-git-store.yaml b/infrastructure/helm/templates/pvc-git-store.yaml
new file mode 100644
index 0000000..4c1fc2c
--- /dev/null
+++ b/infrastructure/helm/templates/pvc-git-store.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "tod.fullname" . }}-git-store
+  labels:
+    {{- include "tod.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  {{- if .Values.storage.gitStore.storageClass }}
+  storageClassName: {{ .Values.storage.gitStore.storageClass | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.storage.gitStore.size }}
diff --git a/infrastructure/helm/templates/pvc-wireguard-config.yaml b/infrastructure/helm/templates/pvc-wireguard-config.yaml
new file mode 100644
index 0000000..43e9b36
--- /dev/null
+++ b/infrastructure/helm/templates/pvc-wireguard-config.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.wireguard.enabled }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "tod.fullname" . }}-wireguard-config
+  labels:
+    {{- include "tod.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  {{- if .Values.wireguard.storageClass }}
+  storageClassName: {{ .Values.wireguard.storageClass | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.wireguard.storage }}
+{{- end }}