diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 63b6980a59..7e142010e5 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -24,8 +24,7 @@ fedmsg_certs:
   - nagios.host.state.change
   - nagios.service.state.change
 
-fas_client_groups: sysadmin-noc,sysadmin-veteran
-
+primary_auth_source: ipa
 ipa_host_group: nagios
 ipa_host_group_desc: Nagios Monitoring
 ipa_client_shell_groups:
diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index ce68a419dd..312270b83b 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -19,8 +19,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - { role: ipa/client, when: env == "staging" }
-  - { role: fas_client, when: env != "staging" }
+  - ipa/client
   - collectd/base
   - { role: rsyncd, when: datacenter == 'iad2' }
   - sudo
@@ -41,7 +40,6 @@
   - { role: letsencrypt, site_name: 'nagios-external.fedoraproject.org', when: inventory_hostname.startswith('noc02') }
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: