diff --git a/ansible/helm_external.yml b/ansible/helm_external.yml
index bff5d0069..1ba1dc2e9 100644
--- a/ansible/helm_external.yml
+++ b/ansible/helm_external.yml
@@ -43,5 +43,5 @@
       include_tasks: tasks/helm_external.yml
       vars:
         external_dir_name: rabbitmq-external
-        server_type: rabbitmq
+        server_type: rmq-cluster
         network_interface: "{{ rabbitmq_network_interface }}"
diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml
index d9aad21d0..2fc85e5f7 100644
--- a/values/wire-server/prod-values.example.yaml
+++ b/values/wire-server/prod-values.example.yaml
@@ -27,6 +27,8 @@ brig:
       host: cassandra-external
     elasticsearch:
       host: elasticsearch-external
+    rabbitmq:
+      host: rabbitmq-external
     useSES: false
     # Set to false if you want to hand out DynamoDB to store prekeys
     randomPrekeys: true
@@ -138,6 +140,8 @@ galley:
   config:
     cassandra:
       host: cassandra-external
+    rabbitmq:
+      host: rabbitmq-external
     settings:
       # prefix URI used when inviting users to a conversation by link
       conversationCodeURI: https://account.example.com/conversation-join/ # change this