diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml
index 901c03efeb..12673e93fb 100644
--- a/playbooks/groups/os-cluster.yml
+++ b/playbooks/groups/os-cluster.yml
@@ -16,8 +16,7 @@
     - rkhunter
     - nagios_client
     - hosts
-    - { role: fas_client, when: env != 'staging' }
-    - { role: ipa/client, when: env == "staging" }
+    - ipa/client
     - collectd/base
     - rsyncd
     - sudo
@@ -47,8 +46,6 @@
          state: present
 
     - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-    - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-      when: env != 'staging'
     - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
diff --git a/playbooks/groups/os-proxies.yml b/playbooks/groups/os-proxies.yml
index c9bb352c8c..15cba7b42e 100644
--- a/playbooks/groups/os-proxies.yml
+++ b/playbooks/groups/os-proxies.yml
@@ -18,8 +18,7 @@
 
   roles:
   - base
-  - { role: ipa/client, when: env == "staging" }
-  - { role: fas_client, when: env != "staging" }
+  - ipa/client
   - rkhunter
   - nagios_client
   - collectd/base
@@ -27,7 +26,6 @@
   - keepalived
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   - name: install haproxy