diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
index 4aae120..f649989 100644
--- a/charts/vaultwarden/Chart.yaml
+++ b/charts/vaultwarden/Chart.yaml
@@ -13,5 +13,5 @@ maintainers:
   - name: guerzon
     email: guerzon@proton.me
     url: https://github.com/guerzon
-version: 0.16.1
+version: 0.17.0
 kubeVersion: ">=1.12.0-0"
diff --git a/charts/vaultwarden/templates/statefulset.yaml b/charts/vaultwarden/templates/statefulset.yaml
index 64c1159..ba06d73 100644
--- a/charts/vaultwarden/templates/statefulset.yaml
+++ b/charts/vaultwarden/templates/statefulset.yaml
@@ -110,16 +110,17 @@ spec:
               path: /alive
               port: 8080
             initialDelaySeconds: 5
-          {{- if .Values.data }}
+          {{- if or (.Values.data) (.Values.attachments) }}
           volumeMounts:
+          {{- if .Values.data }}
             - name: {{ .Values.data.name }}
               mountPath: {{ default "/data" .Values.data.path }}
           {{- end }}
           {{- if .Values.attachments }}
-          volumeMounts:
             - name: {{ .Values.attachments.name }}
               mountPath: {{ default "/data/attachments" .Values.attachments.path }}
           {{- end }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
         {{- if .Values.sidecars }}