diff --git a/inventory/group_vars/badges b/inventory/group_vars/badges
index 7249fcbfae..52f13d6caf 100644
--- a/inventory/group_vars/badges
+++ b/inventory/group_vars/badges
@@ -1,4 +1,5 @@
 ---
+primary_auth_source: ipa
 ipa_host_group: badges
 ipa_host_group_desc: Hosts running the Badges application
 ipa_client_shell_groups:
diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml
index 3baa9b97ee..97f1b1da00 100644
--- a/playbooks/groups/badges-backend.yml
+++ b/playbooks/groups/badges-backend.yml
@@ -20,8 +20,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - { role: ipa/client, when: env == "staging" }
-  - { role: fas_client, when: env != "staging" }
+  - ipa/client
   - collectd/base
   - fedmsg/base
   - sudo
@@ -32,7 +31,6 @@
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml
index df4423bcc7..15f2fc52d4 100644
--- a/playbooks/groups/badges-web.yml
+++ b/playbooks/groups/badges-web.yml
@@ -20,8 +20,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - { role: ipa/client, when: env == "staging" }
-  - { role: fas_client, when: env != "staging" }
+  - ipa/client
   - collectd/base
   - badges/frontend
   - fedmsg/base
@@ -43,7 +42,6 @@
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: