diff --git a/charts/cups-airprint/templates/deployment.yaml b/charts/cups-airprint/templates/deployment.yaml
index 2f007bc..a69ac4f 100644
--- a/charts/cups-airprint/templates/deployment.yaml
+++ b/charts/cups-airprint/templates/deployment.yaml
@@ -62,21 +62,21 @@ spec:
             type: Directory
         {{- else }}
           emptyDir: {}
-        {{- end -}}
+        {{- end }}
         - name: config
         {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
-            claimName: airprint-cups-airprint-config
+            claimName: {{ include "cups-airprint.fullname" . }}-config
         {{- else }}
           emptyDir: {}
-        {{- end -}}
+        {{- end }}
         - name: spool
         {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
-            claimName: airprint-cups-airprint-spool
+            claimName: {{ include "cups-airprint.fullname" . }}-spool
         {{- else }}
           emptyDir: {}
-        {{- end -}}
+        {{- end }}
       {{- if .Values.hostNetwork }}
       hostNetwork: {{ .Values.hostNetwork }}
       {{- end }}