diff --git a/inventory/group_vars/busgateway b/inventory/group_vars/busgateway
index a5c0273f01..bd7a73c267 100644
--- a/inventory/group_vars/busgateway
+++ b/inventory/group_vars/busgateway
@@ -15,7 +15,7 @@ tcp_ports: [
     9919,  # The websocket server publishes here.  Proxies need to connect.
 ]
 
-fas_client_groups: sysadmin-noc,sysadmin-datanommer,sysadmin-veteran
+primary_auth_source: ipa
 ipa_host_group: busgateway
 ipa_host_group_desc: Bridge between fedmsg and fedora-messaging
 ipa_client_shell_groups:
diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml
index 05ba1efb6d..6a87a1baf1 100644
--- a/playbooks/groups/busgateway.yml
+++ b/playbooks/groups/busgateway.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
   - fedmsg/base
   - sudo
@@ -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"
 
   handlers: