diff --git a/inventory/group_vars/osbs b/inventory/group_vars/osbs
index 8ca4aafa14..cd44879060 100644
--- a/inventory/group_vars/osbs
+++ b/inventory/group_vars/osbs
@@ -9,6 +9,7 @@ tcp_ports: [ 80, 443, 8443]
 fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran,sysadmin-osbs
 sudoers: "{{ private }}/files/sudo/osbs-sudoers"
 
+primary_auth_source: ipa
 ipa_host_group: osbs
 ipa_host_group_desc: OpenShift Build Service
 ipa_client_shell_groups:
diff --git a/inventory/group_vars/osbs_aarch64_masters b/inventory/group_vars/osbs_aarch64_masters
index 1af8753c4c..96bb3c7ab3 100644
--- a/inventory/group_vars/osbs_aarch64_masters
+++ b/inventory/group_vars/osbs_aarch64_masters
@@ -12,9 +12,6 @@ tcp_ports: [ 80, 443, 8443]
 openshift_node_labels: {'region':'infra'}
 openshift_schedulable: False
 
-fas_client_groups: sysadmin-releng,sysadmin-noc,sysadmin-osbs
-sudoers: "{{ private }}/files/sudo/osbs-sudoers"
-
 docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 docker_registry: "candidate-registry.fedoraproject.org"
diff --git a/inventory/group_vars/osbs_masters b/inventory/group_vars/osbs_masters
index 330e155ff0..febb9ebccf 100644
--- a/inventory/group_vars/osbs_masters
+++ b/inventory/group_vars/osbs_masters
@@ -6,9 +6,6 @@ num_cpus: 2
 
 tcp_ports: [ 80, 443, 8443]
 
-fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran,sysadmin-osbs
-sudoers: "{{ private }}/files/sudo/osbs-sudoers"
-
 docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 docker_registry: "candidate-registry.fedoraproject.org"
diff --git a/inventory/group_vars/osbs_nodes b/inventory/group_vars/osbs_nodes
index 9541d35f9f..6771ea320b 100644
--- a/inventory/group_vars/osbs_nodes
+++ b/inventory/group_vars/osbs_nodes
@@ -6,9 +6,6 @@ num_cpus: 2
 
 tcp_ports: [ 80, 443, 8443, 10250]
 
-fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran,sysadmin-osbs
-sudoers: "{{ private }}/files/sudo/osbs-sudoers"
-
 docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org"
 docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml
index b0c6795c81..f7350ffe5a 100644
--- a/playbooks/groups/osbs-cluster.yml
+++ b/playbooks/groups/osbs-cluster.yml
@@ -24,7 +24,7 @@
     - rkhunter
     - nagios_client
     - hosts
-    - { role: fas_client, when: env != "staging" }
+    - ipa/client
     - sudo
     - collectd/base
     - rsyncd
@@ -40,8 +40,6 @@
       package:
          name: subscription-manager-rhsm-certificates
          state: present
-    - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-      when: env != "staging"
     - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
diff --git a/playbooks/groups/osbs/deploy-cluster.yml b/playbooks/groups/osbs/deploy-cluster.yml
index ea6b0f39f3..dc580d20ad 100644
--- a/playbooks/groups/osbs/deploy-cluster.yml
+++ b/playbooks/groups/osbs/deploy-cluster.yml
@@ -27,8 +27,7 @@
     - rkhunter
     - nagios_client
     - hosts
-    - { role: ipa/client, when: env == "staging" }
-    - { role: fas_client, when: env != "staging" }
+    - ipa/client
     - sudo
     - collectd/base
     - rsyncd
@@ -44,8 +43,6 @@
       package:
          name: subscription-manager-rhsm-certificates
          state: present
-    - import_tasks: "{{ tasks_path }}/2fa_client.yml"
-      when: env != "staging"
     - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: