diff --git a/charts/kube-plex/templates/deployment.yaml b/charts/kube-plex/templates/deployment.yaml
index 22856f2..b2a897c 100644
--- a/charts/kube-plex/templates/deployment.yaml
+++ b/charts/kube-plex/templates/deployment.yaml
@@ -75,11 +75,23 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: TRANSCODE_PVC
-          value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-transcode{{- end }}
+{{- if .Values.persistence.transcode.claimName }}
+          value: "{{ .Values.persistence.transcode.claimName }}"
+{{- else }}
+          value: "{{ template "fullname" . }}-transcode"
+{{- end }}
         - name: DATA_PVC
-          value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-data{{- end }}
+{{- if .Values.persistence.data.claimName }}
+          value: "{{ .Values.persistence.data.claimName }}"
+{{- else }}
+          value: "{{ template "fullname" . }}-data"
+{{- end }}
         - name: CONFIG_PVC
-          value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-config{{- end }}
+{{- if .Values.persistence.config.claimName }}
+          value: "{{ .Values.persistence.config.claimName }}"
+{{- else }}
+          value: "{{ template "fullname" . }}-config"
+{{- end }}
         volumeMounts:
         - name: data
           mountPath: /data