diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcaa718d61..8ca7744287 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Change .Values.externalRabbitmq.passwordKey from `password` to `""` (default value `rabbitmq-password`) [864](https://github.com/grafana/oncall/pull/864)
+
 ### Added
 
 - Add `locale` column to mobile app user settings table by @joeyorlando [#2131](https://github.com/grafana/oncall/pull/2131)
diff --git a/helm/oncall/tests/rabbitmq_env_test.yaml b/helm/oncall/tests/rabbitmq_env_test.yaml
index 438d2d4508..a969ccd48e 100644
--- a/helm/oncall/tests/rabbitmq_env_test.yaml
+++ b/helm/oncall/tests/rabbitmq_env_test.yaml
@@ -177,7 +177,7 @@ tests:
             name: RABBITMQ_PASSWORD
             valueFrom:
               secretKeyRef:
-                key: password
+                key: rabbitmq-password
                 name: oncall-rabbitmq-external
       - containsDocument:
           kind: Secret
diff --git a/helm/oncall/values.yaml b/helm/oncall/values.yaml
index 248108e27d..9c974780cc 100644
--- a/helm/oncall/values.yaml
+++ b/helm/oncall/values.yaml
@@ -320,7 +320,7 @@ externalRabbitmq:
   # use an existing secret for the rabbitmq password
   existingSecret: ""
   # the key in the secret containing the rabbitmq password
-  passwordKey: password
+  passwordKey: ""
   # the key in the secret containing the rabbitmq username
   usernameKey: username