diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index 465a628157..ec5f5f9539 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -27,7 +27,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   - apache
   - role: keytab/service
@@ -121,6 +121,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: