diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml
index cef0765c6d..4af0bd308b 100644
--- a/playbooks/groups/value.yml
+++ b/playbooks/groups/value.yml
@@ -15,7 +15,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - collectd/base
   - apache
   - { role: fedmsg/base,
@@ -38,6 +38,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: