diff --git a/inventory/group_vars/resultsdb_prod b/inventory/group_vars/resultsdb_prod
index fa24126a57..77e727ce75 100644
--- a/inventory/group_vars/resultsdb_prod
+++ b/inventory/group_vars/resultsdb_prod
@@ -13,8 +13,7 @@ num_cpus: 4
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 
-fas_client_groups: sysadmin-qa
-
+primary_auth_source: ipa
 ipa_host_group: resultsdb
 ipa_host_group_desc: ResultsDB application servers
 ipa_client_shell_groups:
diff --git a/playbooks/groups/resultsdb.yml b/playbooks/groups/resultsdb.yml
index 1fd6ac0b0c..debc9cfc3e 100644
--- a/playbooks/groups/resultsdb.yml
+++ b/playbooks/groups/resultsdb.yml
@@ -23,8 +23,7 @@
    - { role: rkhunter, tags: ['rkhunter'] }
    - { role: nagios_client, tags: ['nagios_client'] }
    - { role: hosts, tags: ['hosts']}
-   - { role: fas_client, when: env != "staging", tags: ['fas_client'] }
-   - { role: ipa/client, when: env == "staging", tags: ['ipa/client'] }
+   - ipa/client
    - { role: collectd/base, tags: ['collectd_base'] }
    - { role: sudo, tags: ['sudo'] }
    - { role: openvpn/client,
@@ -74,8 +73,6 @@
 
   tasks:
   # this is how you include other task lists
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: