diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index 6228d82b20..32efee6f25 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -22,10 +22,6 @@
   - { role: sudo, when: inventory_hostname.startswith('aarch64') }
 
   tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-    when: inventory_hostname.startswith('aarch64')
-  - include: "{{ tasks }}/motd.yml"
-    when: inventory_hostname.startswith('aarch64')
   - include: "{{ tasks }}/yumrepos.yml"
 
   handlers:
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index e79b41acf2..929a74fe6c 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -250,3 +250,11 @@
   when: is_rhel is defined and ansible_architecture == 'x86_64' and ansible_distribution_major_version == '6'
   tags:
   - koji_builder
+
+
+- name: setup fas and sudo on builders
+  sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
+  tasks:
+  - include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks }}/motd.yml"
+