diff --git a/inventory/group_vars/value b/inventory/group_vars/value
index 0477b81eed..302134f35a 100644
--- a/inventory/group_vars/value
+++ b/inventory/group_vars/value
@@ -26,8 +26,7 @@ custom_rules: [
     '-A INPUT -p tcp -m tcp -s 192.168.1.41 --dport 5050 -j ACCEPT',
 ]
 
-fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-mote,sysadmin-veteran
-
+primary_auth_source: ipa
 ipa_host_group: value
 ipa_host_group_desc: "Value added: IRC bots, message logging, etc."
 ipa_client_shell_groups:
diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml
index 3fb8e793e7..91a8f9b6f5 100644
--- a/playbooks/groups/value.yml
+++ b/playbooks/groups/value.yml
@@ -15,8 +15,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - { role: fas_client, when: env != "staging" }
-  - { role: ipa/client, when: env == "staging" }
+  - ipa/client
   - collectd/base
   - apache
   - fedmsg/base
@@ -37,8 +36,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: