diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 7eabfeb7b6..0186ff5372 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -195,13 +195,13 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
-  when: inventory_hostname.startswith(('build','arm04-builder00','arm04-builder01','arm02-builder21','arm02-builder23')) and not inventory_hostname.startswith('buildvm-ppc64')
+  when: inventory_hostname.startswith(('build','arm04-builder00','arm04-builder01','arm02-builder21','arm02-builder23')) and not inventory_hostname.startswith('buildvm-ppc64','buildvm-s390')
   tags:
   - koji_builder
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji dest=/mnt/koji
-  when: inventory_hostname.startswith(('aarch64','ppc8','buildvm-ppc64'))
+  when: inventory_hostname.startswith(('aarch64','ppc8','buildvm-ppc64','buildvm-s390'))
   tags:
   - koji_builder