diff --git a/inventory/host_vars/autosign01.stg.phx2.fedoraproject.org b/inventory/host_vars/autosign01.stg.phx2.fedoraproject.org
deleted file mode 100644
index 7827279225..0000000000
--- a/inventory/host_vars/autosign01.stg.phx2.fedoraproject.org
+++ /dev/null
@@ -1,12 +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
-vmhost: virthost04.stg.phx2.fedoraproject.org
-datacenter: phx2
-
-eth0_ip: 10.5.128.68
diff --git a/inventory/inventory b/inventory/inventory
index 9883c64eab..eeb4626b99 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -191,7 +191,7 @@ sign-vault01.iad2.fedoraproject.org
 autosign01.iad2.fedoraproject.org
 
 [autosign_stg]
-# autosign01.stg.iad2.fedoraproject.org
+autosign01.stg.iad2.fedoraproject.org
 
 [dbserver]
 db01.iad2.fedoraproject.org
@@ -563,7 +563,7 @@ smtp-mm-cc-rdu01.fedoraproject.org
 # All staging hosts should be in this group too.
 #
 [staging]
-# autosign01.stg.iad2.fedoraproject.org
+autosign01.stg.iad2.fedoraproject.org
 # badges-backend01.stg.iad2.fedoraproject.org
 # badges-web01.stg.iad2.fedoraproject.org
 # basset01.stg.iad2.fedoraproject.org
diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml
index 875d5398b4..449aa9aa61 100644
--- a/playbooks/manual/autosign.yml
+++ b/playbooks/manual/autosign.yml
@@ -22,7 +22,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   - sudo
   - role: nfs/client
@@ -82,6 +82,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: