diff --git a/inventory/group_vars/certgetter b/inventory/group_vars/certgetter
index 5969ffe27d..259a598748 100644
--- a/inventory/group_vars/certgetter
+++ b/inventory/group_vars/certgetter
@@ -12,4 +12,4 @@ tcp_ports: [ 80, 443 ]
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
 
-fas_client_groups: sysadmin-main
+primary_auth_source: ipa
diff --git a/playbooks/groups/certgetter.yml b/playbooks/groups/certgetter.yml
index 076293df0e..0c6aaa2665 100644
--- a/playbooks/groups/certgetter.yml
+++ b/playbooks/groups/certgetter.yml
@@ -15,8 +15,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - { role: fas_client, when: env != "staging" }
-  - { role: ipa/client, when: env == "staging" }
+  - ipa/client
   - rsyncd
   - sudo
   - apache
@@ -27,8 +26,6 @@
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-    when: env != "staging"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   - name: make sure certbot is installed