diff --git a/charts/audiobookshelf/templates/pvc.yaml b/charts/audiobookshelf/templates/pvc.yaml
index e0b3e2d..9410a4f 100644
--- a/charts/audiobookshelf/templates/pvc.yaml
+++ b/charts/audiobookshelf/templates/pvc.yaml
@@ -48,4 +48,56 @@ spec:
   storageClassName: "{{ .Values.persistence.metadata.storageClass }}"
 {{- end }}
 {{- end }}
+{{- end }}
+---
+{{- if and .Values.persistence.audiobooks.enabled (not .Values.persistence.audiobooks.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "audiobookshelf.fullname" . }}-audiobooks
+  labels:
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
+{{- with .Values.persistence.audiobooks.annotations  }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.audiobooks.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.audiobooks.size }}
+{{- if .Values.persistenceaudiobooks.storageClass }}
+{{- if (eq "-" .Values.persistence.audiobooks.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.audiobooks.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end }}
+---
+{{- if and .Values.persistence.podcasts.enabled (not .Values.persistence.podcasts.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "audiobookshelf.fullname" . }}-podcasts
+  labels:
+    {{- include "audiobookshelf.labels" . | nindent 4 }}
+{{- with .Values.persistence.podcasts.annotations  }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.podcasts.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.podcasts.size }}
+{{- if .Values.persistence.podcasts.storageClass }}
+{{- if (eq "-" .Values.persistence.podcasts.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.podcasts.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end }}
\ No newline at end of file