diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml
index d47c7af0c2..9ebcf4ed01 100644
--- a/playbooks/groups/odcs.yml
+++ b/playbooks/groups/odcs.yml
@@ -18,13 +18,14 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - rsyncd
   - sudo
   - collectd/base
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: