diff --git a/inventory/host_vars/mm-backend01.stg.iad2.fedoraproject.org b/inventory/host_vars/mm-backend01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..686b7aab3a
--- /dev/null
+++ b/inventory/host_vars/mm-backend01.stg.iad2.fedoraproject.org
@@ -0,0 +1,17 @@
+---
+lvm_size: 20000
+num_cpus: 2
+nm: 255.255.255.0
+gw: 10.3.166.254
+dns: 10.3.163.33
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.166.25
+vmhost: vmhost-x86-10.stg.iad2.fedoraproject.org
+datacenter: iad2
+mem_size: 16384
+max_mem_size: 16384
+
+# nfs mount options, overrides the all/default
+nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=3"
diff --git a/inventory/host_vars/mm-crawler01.stg.iad2.fedoraproject.org b/inventory/host_vars/mm-crawler01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..9aec1df6ef
--- /dev/null
+++ b/inventory/host_vars/mm-crawler01.stg.iad2.fedoraproject.org
@@ -0,0 +1,13 @@
+---
+lvm_size: 20000
+mem_size: 40960
+num_cpus: 4
+nm: 255.255.255.0
+gw: 10.3.166.254
+dns: 10.3.163.33
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.166.26
+vmhost: vmhost-x86-09.stg.iad2.fedoraproject.org
+datacenter: iad2
diff --git a/inventory/host_vars/mm-frontend01.stg.iad2.fedoraproject.org b/inventory/host_vars/mm-frontend01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..9d908ea9d2
--- /dev/null
+++ b/inventory/host_vars/mm-frontend01.stg.iad2.fedoraproject.org
@@ -0,0 +1,15 @@
+---
+lvm_size: 20000
+mem_size: 8192
+num_cpus: 2
+nm: 255.255.255.0
+gw: 10.3.166.254
+dns: 10.3.163.33
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_guests
+eth0_ip: 10.3.166.27
+vmhost: vmhost-x86-08.stg.iad2.fedoraproject.org
+datacenter: iad2
+
+tcp_ports: [ 80, 443 ]
diff --git a/inventory/inventory b/inventory/inventory
index e7173ccd57..80c5b8d0e0 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -371,13 +371,13 @@ mm-crawler01.iad2.fedoraproject.org
 mm-crawler02.iad2.fedoraproject.org
 
 [mm_frontend_stg]
-# mm-frontend01.stg.iad2.fedoraproject.org
+mm-frontend01.stg.iad2.fedoraproject.org
 
 [mm_backend_stg]
-# mm-backend01.stg.iad2.fedoraproject.org
+mm-backend01.stg.iad2.fedoraproject.org
 
 [mm_crawler_stg]
-# mm-crawler01.stg.iad2.fedoraproject.org
+mm-crawler01.stg.iad2.fedoraproject.org
 
 [mm:children]
 mm_frontend
@@ -603,9 +603,9 @@ koji01.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
-# mm-frontend01.stg.iad2.fedoraproject.org
+mm-backend01.stg.iad2.fedoraproject.org
+mm-crawler01.stg.iad2.fedoraproject.org
+mm-frontend01.stg.iad2.fedoraproject.org
 # notifs-backend01.stg.iad2.fedoraproject.org
 # notifs-web01.stg.iad2.fedoraproject.org
 odcs-backend01.stg.iad2.fedoraproject.org
diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml
index e08db66a1a..4e961f0549 100644
--- a/playbooks/groups/mirrormanager.yml
+++ b/playbooks/groups/mirrormanager.yml
@@ -15,7 +15,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - sudo
   - collectd/base
   - { role: openvpn/client, when: env != "staging" and inventory_hostname.startswith('mm-frontend')  }
@@ -26,6 +26,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: