diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index 8b99f7ad91e5a717ffc0b30e1e42d845a0daca5b..77b87fdd5a79ed8a4211d8255c60884a8a9ec751 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: "0.6.19"
+version: "0.6.20"
 
 appVersion: "3.11.16"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 79379c43044851e862b874e710d738cd23f845b0..ce36961a2f4c2d981973d1f26e00ce21ef3425c4 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-![Version: 0.6.19](https://img.shields.io/badge/Version-0.6.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.11.16](https://img.shields.io/badge/AppVersion-3.11.16-informational?style=flat-square)
+![Version: 0.6.20](https://img.shields.io/badge/Version-0.6.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.11.16](https://img.shields.io/badge/AppVersion-3.11.16-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index 0e601c44b4045983c86d4e230d25086566742d33..c767708e01b53ce66a5b18bf83026d3c21df7e98 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -77,4 +77,5 @@
 | 0.6.17 | 3.11.16 | Upgraded to RabbitMQ 3.11.16 |
 | 0.6.18 | 3.11.16 | Simplified configuration options |
 | 0.6.19 | 3.11.16 | Simplified and refactored SSL/TLS configuration options |
+| 0.6.20 | 3.11.16 | Fixed erlang cookie initialization |
 | | | |
diff --git a/charts/rabbitmq/templates/statefulset.yaml b/charts/rabbitmq/templates/statefulset.yaml
index 0c3f7eca6b02ab7317eca542acf74cc9e0037815..a1e49be3ef769c148146f12f6e575a7186d45808 100644
--- a/charts/rabbitmq/templates/statefulset.yaml
+++ b/charts/rabbitmq/templates/statefulset.yaml
@@ -50,6 +50,14 @@ spec:
             - name: ERLANG_COOKIE
               value: {{ .Values.authentication.erlangCookie }}
             {{- end }}
+          {{- with .Values.env }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          envFrom:
+          {{- range .Values.extraEnvSecrets }}
+            - secretRef:
+                name: {{ . }}
+          {{- end }}
           volumeMounts:
             - name: config
               mountPath: /etc/rabbitmq