diff --git a/ansible/helm_external.yml b/ansible/helm_external.yml
index 68705bf80..aed173a47 100644
--- a/ansible/helm_external.yml
+++ b/ansible/helm_external.yml
@@ -36,12 +36,13 @@
         server_type: cassandra
         network_interface: "{{ cassandra_network_interface }}"
 
-# - hosts: "rmq-cluster"
-#   become: false
-#   tasks:
-#     - name: Generate rabbitmq IPs for helm
-#       include_tasks: tasks/helm_external.yml
-#       vars:
-#         external_dir_name: rabbitmq-external
-#         server_type: rmq-cluster
-#         network_interface: "{{ rabbitmq_network_interface }}"
+- hosts: "rmq-cluster"
+  become: false
+  tasks:
+    - name: Generate rabbitmq IPs for helm
+      include_tasks: tasks/helm_external.yml
+      vars:
+        external_dir_name: rabbitmq-external
+        server_type: rmq-cluster
+        network_interface: "{{ rabbitmq_network_interface }}"
+  tags: rabbitmq-external
diff --git a/bin/offline-helm.sh b/bin/offline-helm.sh
index 4f824d790..4530e9d23 100755
--- a/bin/offline-helm.sh
+++ b/bin/offline-helm.sh
@@ -5,7 +5,7 @@ set -x
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ANSIBLE_DIR="$( cd "$SCRIPT_DIR/../ansible" && pwd )"
-ansible-playbook -i "$ANSIBLE_DIR"/inventory/offline "$ANSIBLE_DIR"/helm_external.yml -vv
+ansible-playbook -i "$ANSIBLE_DIR"/inventory/offline "$ANSIBLE_DIR"/helm_external.yml --skip-tags=rabbitmq-external -vv
 
 helm upgrade --install --wait cassandra-external ./charts/cassandra-external --values ./values/cassandra-external/values.yaml
 helm upgrade --install --wait elasticsearch-external ./charts/elasticsearch-external --values ./values/elasticsearch-external/values.yaml
diff --git a/offline/docs_ubuntu_22.04.md b/offline/docs_ubuntu_22.04.md
index 1cd4da668..5c538d285 100644
--- a/offline/docs_ubuntu_22.04.md
+++ b/offline/docs_ubuntu_22.04.md
@@ -516,10 +516,10 @@ After that continue to the next steps below.
 
 ### Preparing helm values for external services
 Afterwards, run the following playbook to create helm values that tell our helm charts
-what the IP addresses of cassandra, elasticsearch, minio and rabbitmq are.
+what the IP addresses of cassandra, elasticsearch, minio are.
 
 ```
-d ansible-playbook -i ./ansible/inventory/offline/hosts.ini ansible/helm_external.yml
+d ansible-playbook -i ./ansible/inventory/offline/hosts.ini ansible/helm_external.yml --skip-tags=rabbitmq-external
 ```
 
 
diff --git a/offline/federation_preparation.md b/offline/federation_preparation.md
index 9e31c686d..81e42b737 100644
--- a/offline/federation_preparation.md
+++ b/offline/federation_preparation.md
@@ -50,24 +50,10 @@ Create the rabbitmq cluster:
 d ansible-playbook -i ansible/inventory/offline/hosts.ini ansible/rabbitmq.yml
 ```
 
-Uncomment the following section, in the `ansible/helm_external.yml` file:
-```
-# - hosts: "rmq-cluster"
-#   become: false
-#   tasks:
-#     - name: Generate rabbitmq IPs for helm
-#       include_tasks: tasks/helm_external.yml
-#       vars:
-#         external_dir_name: rabbitmq-external
-#         server_type: rmq-cluster
-#         network_interface: "{{ rabbitmq_network_interface }}"
-
-```
-
 and run the following playbook to create values file for helm charts to look for RabbitMQ IP addresses -
 
 ```
-d ansible-playbook -i ./ansible/inventory/offline/hosts.ini ansible/helm_external.yml
+d ansible-playbook -i ./ansible/inventory/offline/hosts.ini ansible/helm_external.yml --tags=rabbitmq-external
 ```
 
 Make Kubernetes aware of where RabbitMQ external stateful service is running:
diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml
index 249ecc615..2b46795cd 100644
--- a/values/wire-server/prod-values.example.yaml
+++ b/values/wire-server/prod-values.example.yaml
@@ -28,7 +28,7 @@ brig:
     elasticsearch:
       host: elasticsearch-external
     rabbitmq:
-      host: rabbitmq
+      host: rabbitmq # name of the rabbitmq service, for e.g. rabbitmq-external
     useSES: false
     # Set to false if you want to hand out DynamoDB to store prekeys
     randomPrekeys: true
@@ -141,7 +141,7 @@ galley:
     cassandra:
       host: cassandra-external
     rabbitmq:
-      host: rabbitmq
+      host: rabbitmq # name of the rabbitmq service, for e.g. rabbitmq-external
     settings:
       # prefix URI used when inviting users to a conversation by link
       conversationCodeURI: https://account.example.com/conversation-join/ # change this