diff --git a/inventory/group_vars/rabbitmq_stg b/inventory/group_vars/rabbitmq_stg
index 4b76264056..8f2588a9ff 100644
--- a/inventory/group_vars/rabbitmq_stg
+++ b/inventory/group_vars/rabbitmq_stg
@@ -1,12 +1,12 @@
 ---
 nm: 255.255.255.0
-gw: 10.5.128.254
-dns: 10.5.126.21
+gw: 10.3.166.254
+dns: 10.3.163.33
 
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-8
-ks_repo: http://10.5.126.23/repo/rhel/RHEL8-x86_64/
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8
+ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
 
-datacenter: phx2
+datacenter: iad2
 
 # Define resources for this group of hosts here. 
 lvm_size: 20000
@@ -41,12 +41,12 @@ tcp_ports: [
 
 custom_rules: [
     # Neeed for rsync from log01 for logs.
-    '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT',
+    '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT',
     '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT',
     # Inter-node traffic
-    '-A INPUT -p tcp -m tcp -s 10.5.128.46 --dport 25672 -j ACCEPT',
-    '-A INPUT -p tcp -m tcp -s 10.5.128.47 --dport 25672 -j ACCEPT',
-    '-A INPUT -p tcp -m tcp -s 10.5.128.48 --dport 25672 -j ACCEPT',
+    '-A INPUT -p tcp -m tcp -s 10.3.166.78 --dport 25672 -j ACCEPT',
+    '-A INPUT -p tcp -m tcp -s 10.3.166.79 --dport 25672 -j ACCEPT',
+    '-A INPUT -p tcp -m tcp -s 10.3.166.80 --dport 25672 -j ACCEPT',
 ]
 
 fas_client_groups: sysadmin-main,sysadmin-messaging
diff --git a/inventory/host_vars/rabbitmq01.stg.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..712ff37501
--- /dev/null
+++ b/inventory/host_vars/rabbitmq01.stg.iad2.fedoraproject.org
@@ -0,0 +1,4 @@
+---
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.166.78
+vmhost: vmhost-x86-03.stg.iad2.fedoraproject.org
diff --git a/inventory/host_vars/rabbitmq01.stg.phx2.fedoraproject.org b/inventory/host_vars/rabbitmq01.stg.phx2.fedoraproject.org
deleted file mode 100644
index a9c6451eb5..0000000000
--- a/inventory/host_vars/rabbitmq01.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-volgroup: /dev/vg_guests
-eth0_ip: 10.5.128.46
-vmhost: virthost01.stg.phx2.fedoraproject.org
diff --git a/inventory/host_vars/rabbitmq02.stg.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq02.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..94e16e4b29
--- /dev/null
+++ b/inventory/host_vars/rabbitmq02.stg.iad2.fedoraproject.org
@@ -0,0 +1,4 @@
+---
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.166.79
+vmhost: vmhost-x86-04.stg.iad2.fedoraproject.org
diff --git a/inventory/host_vars/rabbitmq02.stg.phx2.fedoraproject.org b/inventory/host_vars/rabbitmq02.stg.phx2.fedoraproject.org
deleted file mode 100644
index a824b371b3..0000000000
--- a/inventory/host_vars/rabbitmq02.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-volgroup: /dev/vg_guests
-eth0_ip: 10.5.128.47
-vmhost: virthost02.stg.phx2.fedoraproject.org
diff --git a/inventory/host_vars/rabbitmq03.stg.iad2.fedoraproject.org b/inventory/host_vars/rabbitmq03.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..b0bdbf850f
--- /dev/null
+++ b/inventory/host_vars/rabbitmq03.stg.iad2.fedoraproject.org
@@ -0,0 +1,4 @@
+---
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.166.80
+vmhost: vmhost-x86-04.stg.iad2.fedoraproject.org
diff --git a/inventory/host_vars/rabbitmq03.stg.phx2.fedoraproject.org b/inventory/host_vars/rabbitmq03.stg.phx2.fedoraproject.org
deleted file mode 100644
index 89d6e71664..0000000000
--- a/inventory/host_vars/rabbitmq03.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-volgroup: /dev/vg_guests
-eth0_ip: 10.5.128.48
-vmhost: virthost03.stg.phx2.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index 9f86210e7a..0a67ccf6f8 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -4,9 +4,9 @@ rabbitmq02.iad2.fedoraproject.org
 rabbitmq03.iad2.fedoraproject.org
 
 [rabbitmq_stg]
-# rabbitmq01.stg.iad2.fedoraproject.org
-# rabbitmq02.stg.iad2.fedoraproject.org
-# rabbitmq03.stg.iad2.fedoraproject.org
+rabbitmq01.stg.iad2.fedoraproject.org
+rabbitmq02.stg.iad2.fedoraproject.org
+rabbitmq03.stg.iad2.fedoraproject.org
 
 [dbgserver_stg]
 # dbgserver01.stg.iad2.fedoraproject.org
@@ -635,9 +635,9 @@ os-node05.stg.iad2.fedoraproject.org
 # pkgs01.stg.iad2.fedoraproject.org
 proxy01.stg.iad2.fedoraproject.org
 proxy02.stg.iad2.fedoraproject.org
-# rabbitmq01.stg.iad2.fedoraproject.org
-# rabbitmq02.stg.iad2.fedoraproject.org
-# rabbitmq03.stg.iad2.fedoraproject.org
+rabbitmq01.stg.iad2.fedoraproject.org
+rabbitmq02.stg.iad2.fedoraproject.org
+rabbitmq03.stg.iad2.fedoraproject.org
 # resultsdb-stg01.qa.fedoraproject.org
 retrace-stg.aws.fedoraproject.org
 # sign-bridge01.stg.iad2.fedoraproject.org
diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml
index 40fda2a2d5..16416c20a0 100644
--- a/playbooks/groups/rabbitmq.yml
+++ b/playbooks/groups/rabbitmq.yml
@@ -18,7 +18,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   # RabbitMQ statistics are cluster-wide, only collect them on one member
   - role: collectd/rabbitmq
@@ -29,6 +29,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: