diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index 77b87fdd5a79ed8a4211d8255c60884a8a9ec751..d52e7c6b0be5a58f735ae139c6ccba0e66ef9fab 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: "0.6.20"
+version: "0.6.21"
 
-appVersion: "3.11.16"
+appVersion: "3.11.17"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index ce36961a2f4c2d981973d1f26e00ce21ef3425c4..4f69798f797cd3b7610d003541a6cea504d87f4b 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-![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)
+![Version: 0.6.21](https://img.shields.io/badge/Version-0.6.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.11.17](https://img.shields.io/badge/AppVersion-3.11.17-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index c767708e01b53ce66a5b18bf83026d3c21df7e98..409a567780f45a712d255473c76a612aa5d5795f 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -78,4 +78,5 @@
 | 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 |
+| 0.6.21 | 3.11.17 | Upgraded to RabbitMQ 3.11.17 |
 | | | |