diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index 32efee6f25..6228d82b20 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -22,6 +22,10 @@
   - { 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 8e917001dc..a3c91ae1a9 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -251,9 +251,3 @@
   tags:
   - koji_builder
 
-
-- name: setup fas on all builders
-  tasks:
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
-