diff --git a/inventory/group_vars/datagrepper b/inventory/group_vars/datagrepper
index 9fcc80a767..905a26b7d4 100644
--- a/inventory/group_vars/datagrepper
+++ b/inventory/group_vars/datagrepper
@@ -14,8 +14,7 @@ custom_rules: [
     '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT',
 ]
 
-fas_client_groups: sysadmin-noc,sysadmin-datanommer,fi-apprentice,sysadmin-veteran
-
+primary_auth_source: ipa
 ipa_host_group: datagrepper
 ipa_host_group_desc: Service to grep through historical message bus data
 ipa_client_shell_groups:
diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml
index 681786b125..a520d0ca9c 100644
--- a/playbooks/groups/datagrepper.yml
+++ b/playbooks/groups/datagrepper.yml
@@ -17,8 +17,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - { role: fas_client, when: env != "staging" }
-  - { role: ipa/client, when: env == "staging" }
+  - ipa/client
   - collectd/base
   - fedmsg/base
   - { role: rabbit/user,
@@ -33,8 +32,6 @@
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: