diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 26c1567f281..36b877258e9 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.3.5
+version: 6.3.6
diff --git a/charts/library/common/templates/lib/controller/_volumes.tpl b/charts/library/common/templates/lib/controller/_volumes.tpl
index e2aa485d185..6b1aec81a57 100644
--- a/charts/library/common/templates/lib/controller/_volumes.tpl
+++ b/charts/library/common/templates/lib/controller/_volumes.tpl
@@ -19,6 +19,9 @@ Volumes included by the controller.
       {{- else -}}
         {{- $pvcName = (printf "%s-%s" (include "common.names.fullname" $) $index) -}}
       {{- end -}}
+      {{- if $persistence.forceName -}}
+        {{- $pvcName = $persistence.forceName -}}
+      {{- end -}}
     {{- end }}
   persistentVolumeClaim:
     claimName: {{ $pvcName }}