diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index a38f3c2c69..92db4a5b16 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -15,6 +15,7 @@
   roles:
   - base
   - { role: nfs/client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_koji' }
+  - { role: nfs/client, when: inventory_hostname.startswith('aarch64') , mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: 'fedora_arm' }
   - koji_builder
   - { role: bkernel, when: inventory_hostname.startswith('bkernel') }
   - hosts
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index a3c91ae1a9..86b653273a 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -177,7 +177,7 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
-  when: inventory_hostname.startswith('build')
+  when: inventory_hostname.startswith('build','aarch64')
   tags:
   - koji_builder