diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml
index 9629be9fb..34852e6eb 100644
--- a/bitnami/rabbitmq/Chart.yaml
+++ b/bitnami/rabbitmq/Chart.yaml
@@ -23,4 +23,4 @@ name: rabbitmq
 sources:
   - https://github.com/bitnami/bitnami-docker-rabbitmq
   - https://www.rabbitmq.com
-version: 8.6.3
+version: 8.6.4
diff --git a/bitnami/rabbitmq/templates/secrets.yaml b/bitnami/rabbitmq/templates/secrets.yaml
index 78b01f8f8..1ad3c89d8 100644
--- a/bitnami/rabbitmq/templates/secrets.yaml
+++ b/bitnami/rabbitmq/templates/secrets.yaml
@@ -27,7 +27,11 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
+  {{- if .Values.extraSecretsPrependReleaseName }}
+  name: {{ $.Release.Name }}-{{ $key }}
+  {{- else }}
   name: {{ $key }}
+  {{- end }}
   namespace: {{ $.Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" $ | nindent 4 }}
 type: Opaque
diff --git a/bitnami/rabbitmq/values.yaml b/bitnami/rabbitmq/values.yaml
index ac417b5b6..bad443acf 100644
--- a/bitnami/rabbitmq/values.yaml
+++ b/bitnami/rabbitmq/values.yaml
@@ -301,6 +301,8 @@ extraVolumes: []
 ##         ...
 ##       }
 ##
+## Set this flag to true if extraSecrets should be created with <release-name> prepended.
+extraSecretsPrependReleaseName: false
 extraSecrets: {}
 
 ## Number of RabbitMQ replicas to deploy