diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
index d8eebe8250..5ed348e982 100644
--- a/deploy/helm/Chart.yaml
+++ b/deploy/helm/Chart.yaml
@@ -11,7 +11,7 @@ sources:
   - https://github.com/appsmithorg/appsmith
 home: https://www.appsmith.com/
 icon: https://assets.appsmith.com/appsmith-icon.png
-version: 3.6.0
+version: 3.6.1
 dependencies:
   - condition: redis.enabled
     name: redis
diff --git a/deploy/helm/templates/_helpers.tpl b/deploy/helm/templates/_helpers.tpl
index bf256a6530..86a5b3540f 100644
--- a/deploy/helm/templates/_helpers.tpl
+++ b/deploy/helm/templates/_helpers.tpl
@@ -120,6 +120,12 @@ Return  the proper Storage Class
   {{- end -}}
 {{- end -}}
 
+{{- end -}}
+{{/*
+Get the PV name, using override if specified
+*/}}
+{{- define "appsmith.pvName" -}}
+{{- .Values.persistence.pvNameOverride | default (include "appsmith.fullname" .) -}}
 {{- end -}}
 
 {{/*
diff --git a/deploy/helm/templates/persistentVolume.yaml b/deploy/helm/templates/persistentVolume.yaml
index 51200363b2..c9655bed22 100644
--- a/deploy/helm/templates/persistentVolume.yaml
+++ b/deploy/helm/templates/persistentVolume.yaml
@@ -2,8 +2,7 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "appsmith.fullname" . }}
-  namespace: {{ include "appsmith.namespace" . }}
+  name: {{ include "appsmith.pvName" . }}
 spec:
   capacity:
     storage: {{ .Values.persistence.size | quote }}
diff --git a/deploy/helm/templates/persistentVolumeClaim.yaml b/deploy/helm/templates/persistentVolumeClaim.yaml
index d4e2a22d40..21a774f3fb 100644
--- a/deploy/helm/templates/persistentVolumeClaim.yaml
+++ b/deploy/helm/templates/persistentVolumeClaim.yaml
@@ -21,7 +21,7 @@ spec:
   {{- if .Values.persistence.existingClaim.enabled }}
   volumeName: {{ .Values.persistence.existingClaim.name }}
   {{- else}}
-  volumeName: {{ include "appsmith.fullname" . }}
+  volumeName: {{ include "appsmith.pvName" . }}
   {{- end }}
   resources:
     requests:
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
index a315319679..b9ce8555fc 100644
--- a/deploy/helm/values.yaml
+++ b/deploy/helm/values.yaml
@@ -323,6 +323,13 @@ persistence:
   ## Fine tuning for volumeClaimTemplates
   ##
   reclaimPolicy: Retain
+
+  ## @param persistence.pvNameOverride Override the PV name
+  ## Useful when deploying multiple releases across different namespaces with the same name
+  ## since PersistentVolumes are cluster-scoped resources
+  ##
+  pvNameOverride: ""
+
   existingClaim:
     enabled:
     name: