diff --git a/inventory/host_vars/mbs-backend01.stg.iad2.fedoraproject.org b/inventory/host_vars/mbs-backend01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..02d45d78c7
--- /dev/null
+++ b/inventory/host_vars/mbs-backend01.stg.iad2.fedoraproject.org
@@ -0,0 +1,11 @@
+---
+nm: 255.255.255.0
+gw: 10.3.167.254
+dns: 10.3.163.33
+
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.167.30
+vmhost: bvmhost-x86-01.stg.iad2.fedoraproject.org
+datacenter: iad2
diff --git a/inventory/host_vars/mbs-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/mbs-backend01.stg.phx2.fedoraproject.org
deleted file mode 100644
index 664db08ef3..0000000000
--- a/inventory/host_vars/mbs-backend01.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,11 +0,0 @@
----
-nm: 255.255.255.0
-gw: 10.5.128.254
-dns: 10.5.126.21
-
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-volgroup: /dev/vg_guests
-eth0_ip: 10.5.128.144
-vmhost: virthost01.stg.phx2.fedoraproject.org
-datacenter: phx2
diff --git a/inventory/host_vars/mbs-frontend01.stg.iad2.fedoraproject.org b/inventory/host_vars/mbs-frontend01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..e8a790ef9e
--- /dev/null
+++ b/inventory/host_vars/mbs-frontend01.stg.iad2.fedoraproject.org
@@ -0,0 +1,11 @@
+---
+nm: 255.255.255.0
+gw: 10.3.167.254
+dns: 10.3.163.33
+
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.167.31
+vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org
+datacenter: iad2
diff --git a/inventory/host_vars/mbs-frontend01.stg.phx2.fedoraproject.org b/inventory/host_vars/mbs-frontend01.stg.phx2.fedoraproject.org
deleted file mode 100644
index 55b063676b..0000000000
--- a/inventory/host_vars/mbs-frontend01.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,11 +0,0 @@
----
-nm: 255.255.255.0
-gw: 10.5.128.254
-dns: 10.5.126.21
-
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-volgroup: /dev/vg_guests
-eth0_ip: 10.5.128.145
-vmhost: virthost01.stg.phx2.fedoraproject.org
-datacenter: phx2
diff --git a/inventory/inventory b/inventory/inventory
index eeb4626b99..6d6400e82f 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -153,14 +153,13 @@ mailman02.iad2.fedoraproject.org
 mbs-frontend01.iad2.fedoraproject.org
 
 [mbs_frontend_stg]
-# mbs-frontend01.stg.iad2.fedoraproject.org
-# mbs-frontend02.stg.iad2.fedoraproject.org
+mbs-frontend01.stg.iad2.fedoraproject.org
 
 [mbs_backend]
 mbs-backend01.iad2.fedoraproject.org
 
 [mbs_backend_stg]
-# mbs-backend01.stg.iad2.fedoraproject.org
+mbs-backend01.stg.iad2.fedoraproject.org
 
 [mbs:children]
 mbs_frontend
@@ -604,8 +603,8 @@ db03.stg.iad2.fedoraproject.org
 ipa01.stg.iad2.fedoraproject.org
 koji01.stg.iad2.fedoraproject.org
 # mailman01.stg.iad2.fedoraproject.org
-# mbs-backend01.stg.iad2.fedoraproject.org
-# mbs-frontend01.stg.iad2.fedoraproject.org
+mbs-backend01.stg.iad2.fedoraproject.org
+mbs-frontend01.stg.iad2.fedoraproject.org
 # memcached01.stg.iad2.fedoraproject.org
 # mm-backend01.stg.iad2.fedoraproject.org
 # mm-crawler01.stg.iad2.fedoraproject.org
diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml
index 6f5c279ff1..20618a7493 100644
--- a/playbooks/groups/mbs.yml
+++ b/playbooks/groups/mbs.yml
@@ -18,13 +18,14 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - rsyncd
   - sudo
   - collectd/base
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: