diff --git a/roles/rabbit/queue/defaults/main.yml b/roles/rabbit/queue/defaults/main.yml
index de746aad9a..0d43fb59e6 100644
--- a/roles/rabbit/queue/defaults/main.yml
+++ b/roles/rabbit/queue/defaults/main.yml
@@ -1,4 +1,4 @@
-rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+rabbitmq_server: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
 vhost: /pubsub
 default_exchange: amq.topic
 routing_keys: []
diff --git a/roles/rabbit/user/defaults/main.yml b/roles/rabbit/user/defaults/main.yml
index e0971f6832..367d43e680 100644
--- a/roles/rabbit/user/defaults/main.yml
+++ b/roles/rabbit/user/defaults/main.yml
@@ -1,2 +1,2 @@
-rabbitmq_server: "rabbitmq01{{ env_suffix }}.{{ preferred_dc }}.fedoraproject.org"
+rabbitmq_server: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
 vhost: /pubsub
diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index ae2858e485..2a777f03fd 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -402,8 +402,7 @@
 # choke up rabbitmq_parameters.
 - name: Configure federation upstream from pubsub to the public_pubsub vhost
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ item }}.fedoraproject.org"
-  with_items: "{{ datacenter }}"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   when: "env == 'staging'"
   rabbitmq_parameter:
     component: "federation-upstream"
@@ -412,22 +411,9 @@
     state: present
     vhost: /public_pubsub
 
-- name: Configure federation upstream from pubsub to the public_pubsub vhost (phx2)
-  run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ item }}.fedoraproject.org"
-  with_items: "{{ datacenter }}"
-  when: "env == 'production' and datacenter == 'phx2'"
-  rabbitmq_parameter:
-    component: "federation-upstream"
-    name: "pubsub-to-public_pubsub"
-    value: '{"uri": "amqps://pubsub_federation:@rabbitmq01.phx2.fedoraproject.org/%2Fpubsub?cacertfile=%2Fetc%2Frabbitmq%2Fca.crt&certfile=%2Fetc%2Frabbitmq%2Fpubsub_federation%2Fclient_cert.pem&keyfile=%2Fetc%2Frabbitmq%2Fpubsub_federation%2Fclient_key.pem&verify=verify_peer&fail_if_no_peer_cert=true&server_name_indication=rabbitmq.fedoraproject.org&auth_mechanism=external", "ack-mode": "on-confirm"}'
-    state: present
-    vhost: /public_pubsub
-
 - name: Configure federation upstream from pubsub to the public_pubsub vhost (iad2)
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ item }}.fedoraproject.org"
-  with_items: "{{ datacenter }}"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   when: "env == 'production' and datacenter == 'iad2'"
   rabbitmq_parameter:
     component: "federation-upstream"
@@ -438,8 +424,7 @@
 
 - name: Configure a policy to federate the pubsub topic exchange to public_pubsub
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ item }}.fedoraproject.org"
-  with_items: "{{ datacenter }}"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   rabbitmq_policy:
     apply_to: exchanges
     name: pubsub-to-public_pubsub