diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 6a378dd3c5..0d0c57bab9 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -185,7 +185,7 @@
     - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
 - name: configure sshfs on buildvm-s390x-01
-  hosts: buildvm-s390x-01.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org
+  hosts: buildvm-s390x-01.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org:buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org
   tags:
     - sshfs
   user: root
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index c97038a885..31ec276c6a 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -200,7 +200,7 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
-  when: inventory_hostname == "buildvm-s390x-01.s390.fedoraproject.org"
+  when: inventory_hostname.startswith(('buildvm-s390x-01.s390', 'buildvm-s390x-15', 'buildvm-s390x-16'))
   tags:
   - koji_builder