diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml
index 1fa9aa2e63..6ab9209032 100644
--- a/playbooks/groups/batcave.yml
+++ b/playbooks/groups/batcave.yml
@@ -56,6 +56,15 @@
       warning: 10
       critical: 100
     when: datacenter != 'iad2'
+  - role: rabbit/queue
+    username: "mirror_pagure_ansible{{ env_suffix }}_iad2"
+    queue_name: "mirror_pagure_ansible{{ env_suffix }}_iad2"
+    routing_keys:
+      - "io.pagure.*.pagure.git.receive"
+    thresholds:
+      warning: 10
+      critical: 100
+    when: datacenter != 'iad2'
   - batcave
   - { role: nfs/client, when: inventory_hostname.startswith('batcave') and datacenter != 'iad2', mnt_dir: '/srv/web/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
   - { role: nfs/client, when: inventory_hostname.startswith('batcave01') and datacenter != 'iad2', mnt_dir: '/mnt/fedora/app',  nfs_src_dir: 'fedora_app/app' }
diff --git a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg
index c474599ad3..e86bc951a7 100644
--- a/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg
+++ b/roles/mirror_pagure_ansible/templates/mirror_pagure_ansible.cfg
@@ -8,21 +8,18 @@ callback = "mirror_from_pagure_bus:MirrorFromPagure"
 # Don't use topic_prefix, since outgoing message topics are derived from incoming messages.
 # topic_prefix = ""
 
-{% if inventory_hostname.startswith('batcave01.') %}
 [[bindings]]
+{% if inventory_hostname.startswith('batcave01.phx2') %}
 queue = "mirror_pagure_ansible{{ env_suffix }}"
-exchange = "amq.topic"
-routing_keys = [
-    "io.pagure.*.pagure.git.receive",
-]
-{% elif inventory_hostname.startswith('batcave13.') %}
-[[bindings]]
+{% elif inventory_hostname.startswith('batcave01.iad2') %}
+queue = "mirror_pagure_ansible{{ env_suffix }}_iad2"
+{% elif inventory_hostname.startswith('batcave13.phx2') %}
 queue = "mirror_pagure_ansible{{ env_suffix }}_13"
+{% endif %}
 exchange = "amq.topic"
 routing_keys = [
     "io.pagure.*.pagure.git.receive",
 ]
-{% endif %}
 
 [tls]
 ca_cert = "/etc/pki/fedora-messaging/cacert.pem"