diff --git a/inventory/builders b/inventory/builders
index 983702d09e..44026c194a 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -286,7 +286,6 @@ buildvm-armv7-03.arm.fedoraproject.org
 buildvm-ppc64le-01.stg.ppc.fedoraproject.org
 buildvm-ppc64le-01.ppc.fedoraproject.org
 buildvm-ppc64le-02.ppc.fedoraproject.org
-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
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 34983ade9c..c836e60b39 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:buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org
+  hosts: 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/base/templates/iptables/iptables.kojibuilder b/roles/base/templates/iptables/iptables.kojibuilder
index ceaefa98b3..c797ba1448 100644
--- a/roles/base/templates/iptables/iptables.kojibuilder
+++ b/roles/base/templates/iptables/iptables.kojibuilder
@@ -74,7 +74,7 @@
 # SSH
 -A INPUT -p tcp -m tcp -s 10.5.0.0/16 --dport 22 -j ACCEPT 
 -A OUTPUT -p tcp -m tcp -d 10.5.0.0/16 --sport 22  -j ACCEPT
-{% if inventory_hostname.startswith (('buildvm-s390x-01.s390', 'buildvm-s390x-15', 'buildvm-s390x-16')) %}
+{% if inventory_hostname.startswith (('buildvm-s390x-15', 'buildvm-s390x-16')) %}
 # Allow SSHFS binding to koji01
 -A OUTPUT -p tcp -m tcp -d 10.5.125.61 --dport 22  -j ACCEPT
 {% endif %}
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 31ec276c6a..d1884316af 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.startswith(('buildvm-s390x-01.s390', 'buildvm-s390x-15', 'buildvm-s390x-16'))
+  when: inventory_hostname.startswith(('buildvm-s390x-15', 'buildvm-s390x-16'))
   tags:
   - koji_builder