diff --git a/templates/deploy-admin.yaml b/templates/deploy-admin.yaml
index e83e827c258f1f5593b57617c647a44ec4ff4146..538e466b30870a7fa8345ad3dcd4bdc3ffa29cf5 100644
--- a/templates/deploy-admin.yaml
+++ b/templates/deploy-admin.yaml
@@ -29,9 +29,9 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: data
-          {{- toYaml .Values.volumes.data | nindent 10 }}
+          {{- .Values.volumes.data | nindent 10 }}
         - name: dkim
-          {{- toYaml .Values.volumes.dkim | nindent 10 }}
+          {{- .Values.volumes.dkim | nindent 10 }}
         - name: config
           configMap:
             name: {{ include "mailu-helm.fullname" . }}-admin
diff --git a/templates/deploy-antispam.yaml b/templates/deploy-antispam.yaml
index 67e0e85a940131de07929c868054b27a5c02c26b..eb168b07b063b86b8faf0cd903148fc3409e7f06 100644
--- a/templates/deploy-antispam.yaml
+++ b/templates/deploy-antispam.yaml
@@ -29,9 +29,9 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: filter
-          {{- toYaml .Values.volumes.filter | nindent 10 }}
+          {{- .Values.volumes.filter | nindent 10 }}
         - name: dkim
-          {{- toYaml .Values.volumes.dkim | nindent 10 }}
+          {{- .Values.volumes.dkim | nindent 10 }}
         - name: config
           secret:
             secretName: {{ include "mailu-helm.fullname" . }}-antispam
diff --git a/templates/deploy-imap.yaml b/templates/deploy-imap.yaml
index 9f4a32f08359d6411c20370087021aa6e2e1acb0..c5df9fa88a25121a77d507e57cf903b1e8c1bfd0 100644
--- a/templates/deploy-imap.yaml
+++ b/templates/deploy-imap.yaml
@@ -29,9 +29,9 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: data
-          {{- toYaml .Values.volumes.data | nindent 10 }}
+          {{- .Values.volumes.data | nindent 10 }}
         - name: mail
-          {{- toYaml .Values.volumes.mail | nindent 10 }}
+          {{- .Values.volumes.mail | nindent 10 }}
       containers:
         - name: imap
           securityContext:
diff --git a/templates/deploy-smtp.yaml b/templates/deploy-smtp.yaml
index 75425a94bbc33f0f25515a540d6f0128b64a4163..5e331dea830a57257b5a80feac65fb13f7325bcc 100644
--- a/templates/deploy-smtp.yaml
+++ b/templates/deploy-smtp.yaml
@@ -29,7 +29,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: data
-          {{- toYaml .Values.volumes.data | nindent 10 }}
+          {{- .Values.volumes.data | nindent 10 }}
         - name: certs
           secret:
             secretName: {{ include "mailu-helm.fullname" . }}-tls
diff --git a/templates/deploy-webdav.yaml b/templates/deploy-webdav.yaml
index 98b2afdb235dcacf082cec01f08bf02de50bbf6b..2766b1becca297d14bb79d769061af784d4e7de0 100644
--- a/templates/deploy-webdav.yaml
+++ b/templates/deploy-webdav.yaml
@@ -29,7 +29,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       volumes:
         - name: webdav
-          {{- toYaml .Values.volumes.webdav | nindent 10 }}
+          {{- .Values.volumes.webdav | nindent 10 }}
       containers:
         - name: webdav
           securityContext:
diff --git a/values.yaml b/values.yaml
index a5e222d02ed2473fc7b89c11034e55073f6dce64..06a9b059a75cc35b5e43ae614e4930208bbb9b5f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -50,15 +50,15 @@ certificate:
     - "mail.example.com"
 
 volumes:
-  dkim:
+  dkim: |-
     emptyDir: {}
-  data:
+  data: |-
     emptyDir: {}
-  mail:
+  mail: |-
     emptyDir: {}
-  filter:
+  filter: |-
     emptyDir: {}
-  webdav:
+  webdav: |-
     emptyDir: {}
 
 front: