diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml
index 2d0d3d947c..37ed2e5e25 100644
--- a/playbooks/groups/postgresql-server.yml
+++ b/playbooks/groups/postgresql-server.yml
@@ -23,7 +23,7 @@
   roles:
   - base
   - rkhunter
-  - fas_client
+  - { role: fas_client, when: env != "staging" }
   - nagios_client
   - hosts
   - postgresql_server
@@ -33,6 +33,7 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
 # TODO: add iscsi task