diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 37c9c1df29b..31fb69bb851 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources:
 type: library
-version: 6.6.0
+version: 6.6.1
diff --git a/charts/library/common/templates/lib/controller/_volumeMounts.tpl b/charts/library/common/templates/lib/controller/_volumeMounts.tpl
index 74b44efc249..9dcd863f046 100644
--- a/charts/library/common/templates/lib/controller/_volumeMounts.tpl
+++ b/charts/library/common/templates/lib/controller/_volumeMounts.tpl
@@ -24,9 +24,13 @@
 
   {{- if eq .Values.controller.type "statefulset" }}
     {{- range $index, $vct := .Values.volumeClaimTemplates }}
+    {{- $vctname := $index }}
+    {{- if $vct.name }}
+    {{- $vctname := $vct.name }}
+    {{- end }}
     {{- if not $vct.noMount }}
 - mountPath: {{ $vct.mountPath }}
-  name: {{ $vct.name }}
+  name: {{ $vctname }}
       {{- if $vct.subPath }}
   subPath: {{ $vct.subPath }}
       {{- end }}