diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml
index ce2c56f802..4d8a91d51e 100644
--- a/stable/rabbitmq/Chart.yaml
+++ b/stable/rabbitmq/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: rabbitmq
-version: 6.2.0
+version: 6.2.1
 appVersion: 3.7.16
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/stable/rabbitmq/README.md b/stable/rabbitmq/README.md
index 885f7219ee..8b3f83a399 100644
--- a/stable/rabbitmq/README.md
+++ b/stable/rabbitmq/README.md
@@ -55,8 +55,6 @@ The following table lists the configurable parameters of the RabbitMQ chart and
 | `image.pullPolicy`                   | Image pull policy                                | `IfNotPresent`                                          |
 | `image.pullSecrets`                  | Specify docker-registry secret names as an array | `nil`                                                   |
 | `image.debug`                        | Specify if debug values should be set            | `false`                                                 |
-| `nameOverride`                       | String to partially override rabbitmq.fullname template with a string (will prepend the release name) | `nil` |
-| `fullnameOverride`                   | String to fully override rabbitmq.fullname template with a string                                     | `nil` |
 | `rbacEnabled`                        | Specify if rbac is enabled in your cluster       | `true`                                                  |
 | `podManagementPolicy`                | Pod management policy                            | `OrderedReady`                                          |
 | `rabbitmq.username`                  | RabbitMQ application username                    | `user`                                                  |
diff --git a/stable/rabbitmq/values-production.yaml b/stable/rabbitmq/values-production.yaml
index ee9a772da9..da270973a2 100644
--- a/stable/rabbitmq/values-production.yaml
+++ b/stable/rabbitmq/values-production.yaml
@@ -32,14 +32,6 @@ image:
   # pullSecrets:
   #   - myRegistryKeySecretName
 
-## String to partially override rabbitmq.fullname template (will maintain the release name)
-##
-# nameOverride:
-
-## String to fully override rabbitmq.fullname template
-##
-# fullnameOverride:
-
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
 ##
@@ -141,9 +133,9 @@ rabbitmq:
   extraConfiguration: |-
     #disk_free_limit.absolute = 50MB
     #management.load_definitions = /app/load_definition.json
-
+    
   ## Configuration file content: advanced configuration
-  ## Use this as additional configuraton in classic config format (Erlang term configuration format)
+  ## Use this as additional configuraton in classic config format (Erlang term configuration format) 
   advancedConfiguration: |-
 
 ## Kubernetes service type
diff --git a/stable/rabbitmq/values.yaml b/stable/rabbitmq/values.yaml
index e39b43a78a..f51b7b910d 100644
--- a/stable/rabbitmq/values.yaml
+++ b/stable/rabbitmq/values.yaml
@@ -32,14 +32,6 @@ image:
   # pullSecrets:
   #   - myRegistryKeySecretName
 
-## String to partially override rabbitmq.fullname template (will maintain the release name)
-##
-# nameOverride:
-
-## String to fully override rabbitmq.fullname template
-##
-# fullnameOverride:
-
 ## Use an alternate scheduler, e.g. "stork".
 ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
 ##