diff --git a/playbooks/groups/certgetter.yml b/playbooks/groups/certgetter.yml
index 5f89894ace..7ca9fcbf33 100644
--- a/playbooks/groups/certgetter.yml
+++ b/playbooks/groups/certgetter.yml
@@ -15,7 +15,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - rsyncd
   - sudo
   - apache
@@ -27,6 +27,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   - name: make sure certbot is installed