diff --git a/charts/etcd/templates/_helper.tpl b/charts/etcd/templates/_helper.tpl
new file mode 100644
index 0000000..bae5a40
--- /dev/null
+++ b/charts/etcd/templates/_helper.tpl
@@ -0,0 +1,7 @@
+{{- define "dataVolumeName" -}}
+{{- if (.Values.volumeClaimNameOverride) -}}
+{{ .Values.volumeClaimNameOverride }}
+{{- else -}}
+virtual-garden-{{ .Values.name }}
+{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/etcd/templates/statefulset-etcd.yaml b/charts/etcd/templates/statefulset-etcd.yaml
index 98d4a29..b9181aa 100644
--- a/charts/etcd/templates/statefulset-etcd.yaml
+++ b/charts/etcd/templates/statefulset-etcd.yaml
@@ -96,7 +96,7 @@ spec:
             cpu: {{ .Values.resources.limits.cpu | default "1000m" }}
             memory: {{ .Values.resources.limits.memory | default "2560Mi" }}
         volumeMounts:
-        - name: virtual-garden-{{ .Values.name }}
+        - name: {{ template "dataVolumeName" . }}
           mountPath: /var/etcd/data
         - name: etcd-bootstrap
           mountPath: /bootstrap
@@ -171,7 +171,7 @@ spec:
         volumeMounts:
         - name: etcd-bootstrap
           mountPath: /bootstrap
-        - name: virtual-garden-{{ .Values.name }}
+        - name: {{ template "dataVolumeName" . }}
           mountPath: /var/etcd/data
         - name: ca-etcd
           mountPath: /var/etcd/ssl/ca
@@ -208,7 +208,7 @@ spec:
 {{- end }}
   volumeClaimTemplates:
   - metadata:
-      name: virtual-garden-{{ .Values.name }}
+      name: {{ template "dataVolumeName" . }}
     spec:
       accessModes:
       - "ReadWriteOnce"
diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
index 2f42080..318a2ed 100644
--- a/charts/etcd/values.yaml
+++ b/charts/etcd/values.yaml
@@ -57,3 +57,5 @@ resources:
 volumeClaimTemplates:
   requests:
     storage: 10Gi
+
+volumeClaimNameOverride: "" # override name of volumeClaim. Defaults to `virtual-garden-{{ .Values.name }}`