diff --git a/inventory/host_vars/busgateway01.stg.iad2.fedoraproject.org b/inventory/host_vars/busgateway01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..3e00bfc8ed
--- /dev/null
+++ b/inventory/host_vars/busgateway01.stg.iad2.fedoraproject.org
@@ -0,0 +1,14 @@
+---
+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/
+
+eth0_ip: 10.3.166.38
+
+volgroup: /dev/vg_guests
+vmhost: vmhost-x86-03.stg.iad22.fedoraproject.org
+
+datacenter: iad2
diff --git a/inventory/host_vars/busgateway01.stg.phx2.fedoraproject.org b/inventory/host_vars/busgateway01.stg.phx2.fedoraproject.org
deleted file mode 100644
index 477e854fa5..0000000000
--- a/inventory/host_vars/busgateway01.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,14 +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/
-
-eth0_ip: 10.5.128.88
-
-volgroup: /dev/vg_virthost16
-vmhost: virthost05.stg.phx2.fedoraproject.org
-
-datacenter: phx2
diff --git a/inventory/inventory b/inventory/inventory
index eb0189581a..0bebf337fa 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -127,7 +127,7 @@ fedimg01.iad2.fedoraproject.org
 busgateway01.iad2.fedoraproject.org
 
 [busgateway_stg]
-# busgateway01.stg.iad2.fedoraproject.org
+busgateway01.stg.iad2.fedoraproject.org
 
 [fedocal]
 fedocal01.iad2.fedoraproject.org
@@ -215,7 +215,7 @@ db-koji01.stg.iad2.fedoraproject.org
 # badges-web01.stg.iad2.fedoraproject.org
 blockerbugs01.stg.iad2.fedoraproject.org
 bodhi-backend01.stg.iad2.fedoraproject.org
-# busgateway01.stg.iad2.fedoraproject.org
+busgateway01.stg.iad2.fedoraproject.org
 # datagrepper01.stg.iad2.fedoraproject.org
 # fedocal01.stg.iad2.fedoraproject.org
 koji01.stg.iad2.fedoraproject.org
@@ -581,7 +581,7 @@ buildvm-x86-05.stg.iad2.fedoraproject.org
 # buildvm-armv7-01.stg.arm.fedoraproject.org
 # buildvm-ppc64le-01.stg.ppc.fedoraproject.org
 # buildvm-s390x-01.stg.s390.fedoraproject.org
-# busgateway01.stg.iad2.fedoraproject.org
+busgateway01.stg.iad2.fedoraproject.org
 certgetter01.stg.iad2.fedoraproject.org
 compose-x86-01.stg.iad2.fedoraproject.org
 copr-be-dev.aws.fedoraproject.org
diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml
index e0b7edae24..1bac99b4a1 100644
--- a/playbooks/groups/busgateway.yml
+++ b/playbooks/groups/busgateway.yml
@@ -15,7 +15,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   - fedmsg/base
   - sudo
@@ -27,6 +27,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: