diff --git a/inventory/group_vars/mailman b/inventory/group_vars/mailman
index 3aff498de4..ca246c2b6d 100644
--- a/inventory/group_vars/mailman
+++ b/inventory/group_vars/mailman
@@ -13,8 +13,7 @@ tcp_ports: [
     3000, 3001, 3002, 3003,
 ]
 
-fas_client_groups: sysadmin-tools,sysadmin-main
-
+primary_auth_source: ipa
 ipa_host_group: mailman
 ipa_host_group_desc: Mailing list services
 ipa_client_shell_groups:
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 8d6b3a2dd1..6d84dc208c 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.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
   - sudo
   - { role: openvpn/client,
@@ -33,7 +32,6 @@
 
   tasks:
   # this is how you include other task lists
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: