diff --git a/inventory/builders b/inventory/builders
index f601e4b8b2..11e09008d6 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -162,16 +162,9 @@ buildvm-s390x-22.s390.fedoraproject.org
 buildvm-s390x-23.s390.fedoraproject.org
 buildvm-s390x-24.s390.fedoraproject.org
 buildvm-s390x-25.s390.fedoraproject.org
+# These two have more cpu/memory for 'heavybuilder' channel
 buildvm-s390x-26.s390.fedoraproject.org
 buildvm-s390x-27.s390.fedoraproject.org
-buildvm-s390x-28.s390.fedoraproject.org
-buildvm-s390x-29.s390.fedoraproject.org
-buildvm-s390x-30.s390.fedoraproject.org
-#buildvm-s390x-31.s390.fedoraproject.org
-#buildvm-s390x-32.s390.fedoraproject.org
-#buildvm-s390x-33.s390.fedoraproject.org
-#buildvm-s390x-34.s390.fedoraproject.org
-#buildvm-s390x-35.s390.fedoraproject.org
 
 [buildvm_s390x:children]
 buildvm_s390x_zvm
diff --git a/inventory/group_vars/buildvm_s390x_kvm b/inventory/group_vars/buildvm_s390x_kvm
index deadd5e25c..7fdd616d6d 100644
--- a/inventory/group_vars/buildvm_s390x_kvm
+++ b/inventory/group_vars/buildvm_s390x_kvm
@@ -9,8 +9,8 @@ ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora
 lvm_size: 102400
 main_bridge: vmbr
 max_mem_size: "{{ mem_size }}"
-mem_size: 13312
-num_cpus: 2
+mem_size: 17408
+num_cpus: 3
 virt_install_command: "{{ virt_install_command_s390x_one_nic }}"
 vmhost: buildvmhost-s390x-01.s390.fedoraproject.org
 volgroup: /dev/fedora_linux_lpar_1
diff --git a/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org
index 689bf425b3..9913964b18 100644
--- a/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-26.s390.fedoraproject.org
@@ -1,3 +1,6 @@
 ---
 eth0_ipv4_ip: 10.16.0.37
 volgroup: /dev/fedora_linux_scsi
+mem_size: 34816
+num_cpus: 6
+lvm_size: 204800
diff --git a/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org
index b62fec6fd8..c4708e08f5 100644
--- a/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-27.s390.fedoraproject.org
@@ -1,3 +1,6 @@
 ---
 eth0_ipv4_ip: 10.16.0.38
 volgroup: /dev/fedora_linux_scsi
+mem_size: 34816
+num_cpus: 6
+lvm_size: 204800
diff --git a/inventory/host_vars/buildvm-s390x-28.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-28.s390.fedoraproject.org
deleted file mode 100644
index f423f1c6f7..0000000000
--- a/inventory/host_vars/buildvm-s390x-28.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.39
-volgroup: /dev/fedora_linux_scsi
diff --git a/inventory/host_vars/buildvm-s390x-29.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-29.s390.fedoraproject.org
deleted file mode 100644
index c9a58c6c89..0000000000
--- a/inventory/host_vars/buildvm-s390x-29.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.40
-volgroup: /dev/fedora_linux_scsi
diff --git a/inventory/host_vars/buildvm-s390x-30.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-30.s390.fedoraproject.org
deleted file mode 100644
index e8f5e3e028..0000000000
--- a/inventory/host_vars/buildvm-s390x-30.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.41
-volgroup: /dev/fedora_linux_scsi
diff --git a/inventory/host_vars/buildvm-s390x-31.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-31.s390.fedoraproject.org
deleted file mode 100644
index 943a7a0254..0000000000
--- a/inventory/host_vars/buildvm-s390x-31.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.42
-volgroup: /dev/fedora_linux_scsi
diff --git a/inventory/host_vars/buildvm-s390x-32.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-32.s390.fedoraproject.org
deleted file mode 100644
index c03e3646b0..0000000000
--- a/inventory/host_vars/buildvm-s390x-32.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.43
-volgroup: /dev/fedora_linux_scsi
diff --git a/inventory/host_vars/buildvm-s390x-33.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-33.s390.fedoraproject.org
deleted file mode 100644
index f79a546ecc..0000000000
--- a/inventory/host_vars/buildvm-s390x-33.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.44
-volgroup: /dev/fedora_linux_scsi
diff --git a/inventory/host_vars/buildvm-s390x-34.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-34.s390.fedoraproject.org
deleted file mode 100644
index 989fa0eb71..0000000000
--- a/inventory/host_vars/buildvm-s390x-34.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.45
-volgroup: /dev/fedora_linux_scsi
diff --git a/inventory/host_vars/buildvm-s390x-35.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-35.s390.fedoraproject.org
deleted file mode 100644
index d2e91e9991..0000000000
--- a/inventory/host_vars/buildvm-s390x-35.s390.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-eth0_ipv4_ip: 10.16.0.46
-volgroup: /dev/fedora_linux_scsi