diff --git a/apps/faf-user-service/templates/config.yaml b/apps/faf-user-service/templates/config.yaml
index 914f43da..85b5472f 100644
--- a/apps/faf-user-service/templates/config.yaml
+++ b/apps/faf-user-service/templates/config.yaml
@@ -25,4 +25,5 @@ data:
   LOBBY_URL: "wss://ws.{{.Values.baseDomain}}"
   IRC_TOKEN_TTL: "86400"
   REPLAY_URL: "wss://replay-ws.{{.Values.baseDomain}}"
-  ALTCHA_ENABLED: "true"
\ No newline at end of file
+  ALTCHA_ENABLED: "true"
+  RABBITMQ_USER: "faf-user-service"
\ No newline at end of file
diff --git a/apps/faf-user-service/templates/local-secret.yaml b/apps/faf-user-service/templates/local-secret.yaml
index f31836fd..bf615074 100644
--- a/apps/faf-user-service/templates/local-secret.yaml
+++ b/apps/faf-user-service/templates/local-secret.yaml
@@ -12,4 +12,5 @@ stringData:
   LOBBY_SECRET: "banana"
   REPLAY_SECRET: "banana"
   ALTCHA_HMAC_KEY: "bananabananabananabanana"
+  RABBITMQ_PASSWORD: "banana"
 {{- end}}
diff --git a/apps/rabbitmq/values.yaml b/apps/rabbitmq/values.yaml
index 82b9d710..5dc17484 100644
--- a/apps/rabbitmq/values.yaml
+++ b/apps/rabbitmq/values.yaml
@@ -26,3 +26,7 @@ users:
     secretRef: faf-icebreaker
     usernameKey: RABBITMQ_USER
     passwordKey: RABBITMQ_PASSWORD
+  - configMapRef: faf-user-service
+    secretRef: faf-user-service
+    usernameKey: RABBITMQ_USER
+    passwordKey: RABBITMQ_PASSWORD