diff --git a/inventory/builders b/inventory/builders
index 0bc25771bd..bc49b7afdb 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -236,14 +236,6 @@ buildvm-ppc64le-30.iad2.fedoraproject.org
 buildvm-ppc64le-31.iad2.fedoraproject.org
 buildvm-ppc64le-32.iad2.fedoraproject.org
 buildvm-ppc64le-33.iad2.fedoraproject.org
-buildvm-ppc64le-34.iad2.fedoraproject.org
-buildvm-ppc64le-35.iad2.fedoraproject.org
-buildvm-ppc64le-36.iad2.fedoraproject.org
-buildvm-ppc64le-37.iad2.fedoraproject.org
-buildvm-ppc64le-38.iad2.fedoraproject.org
-buildvm-ppc64le-39.iad2.fedoraproject.org
-buildvm-ppc64le-40.iad2.fedoraproject.org
-buildvm-ppc64le-41.iad2.fedoraproject.org
 
 [bkernel]
 bkernel01.iad2.fedoraproject.org
@@ -264,10 +256,10 @@ buildvm-a64-02.iad2.fedoraproject.org
 buildvm-a64-03.iad2.fedoraproject.org
 # buildvm-ppc64le-01.stg.ppc.fedoraproject.org
 buildvm-ppc64le-01.iad2.fedoraproject.org
-buildvm-ppc64le-11.iad2.fedoraproject.org
-buildvm-ppc64le-21.iad2.fedoraproject.org
-buildvm-ppc64le-31.iad2.fedoraproject.org
-buildvm-ppc64le-41.iad2.fedoraproject.org
+buildvm-ppc64le-09.iad2.fedoraproject.org
+buildvm-ppc64le-18.iad2.fedoraproject.org
+buildvm-ppc64le-27.iad2.fedoraproject.org
+buildvm-ppc64le-33.iad2.fedoraproject.org
 buildvm-s390x-01.stg.s390.fedoraproject.org
 buildvm-s390x-15.s390.fedoraproject.org
 buildvm-s390x-16.s390.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org
index 4aaccef487..004fecc12e 100644
--- a/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-09.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.49
-vmhost: bvmhost-p09-01.iad2.fedoraproject.org
+vmhost: bvmhost-p09-02.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org
index 40f2ef9400..d8d5c06a2e 100644
--- a/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-10.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.50
-vmhost: bvmhost-p09-01.iad2.fedoraproject.org
+vmhost: bvmhost-p09-02.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org
index e6fe904c9c..2d3feddb8e 100644
--- a/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-17.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.57
-vmhost: bvmhost-p09-02.iad2.fedoraproject.org
+vmhost: bvmhost-p09-03.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org
index 64649d918c..2ba48dca3e 100644
--- a/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-18.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.58
-vmhost: bvmhost-p09-02.iad2.fedoraproject.org
+vmhost: bvmhost-p09-03.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org
index fd371434ff..2e6d6cc328 100644
--- a/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-19.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.59
-vmhost: bvmhost-p09-02.iad2.fedoraproject.org
+vmhost: bvmhost-p09-03.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org
index ed4ccb97c8..df852b3179 100644
--- a/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-20.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.60
-vmhost: bvmhost-p09-02.iad2.fedoraproject.org
+vmhost: bvmhost-p09-03.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org
index 034a4092ca..7dfb729dd0 100644
--- a/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-25.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.65
-vmhost: bvmhost-p09-03.iad2.fedoraproject.org
+vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org
index a87de233c6..2fcb366ec4 100644
--- a/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-26.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.66
-vmhost: bvmhost-p09-03.iad2.fedoraproject.org
+vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org
index 854b33ee14..ee25d50be7 100644
--- a/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-27.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.67
-vmhost: bvmhost-p09-03.iad2.fedoraproject.org
+vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org
index cbe572e225..08bdb1e2e8 100644
--- a/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-28.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.68
-vmhost: bvmhost-p09-03.iad2.fedoraproject.org
+vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org
index 65305341e7..357a6c3f4f 100644
--- a/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-29.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.69
-vmhost: bvmhost-p09-03.iad2.fedoraproject.org
+vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org
index d09b00dcdc..2ce21a944d 100644
--- a/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-30.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.70
-vmhost: bvmhost-p09-03.iad2.fedoraproject.org
+vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org
index e2d7d682e3..47c6833805 100644
--- a/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-33.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.171.73
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
+vmhost: bvmhost-p09-05.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-34.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-34.iad2.fedoraproject.org
deleted file mode 100644
index a1ff56ab8e..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-34.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.74
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-35.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-35.iad2.fedoraproject.org
deleted file mode 100644
index b802ece1a8..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-35.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.75
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-36.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-36.iad2.fedoraproject.org
deleted file mode 100644
index 8137f5282a..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-36.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.76
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-37.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-37.iad2.fedoraproject.org
deleted file mode 100644
index 019abed0e8..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-37.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.77
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-38.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-38.iad2.fedoraproject.org
deleted file mode 100644
index 5bfe6a233d..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-38.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.78
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-39.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-39.iad2.fedoraproject.org
deleted file mode 100644
index 5a27b753bb..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-39.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.79
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-40.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-40.iad2.fedoraproject.org
deleted file mode 100644
index aad171f434..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-40.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.80
-vmhost: bvmhost-p09-04.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-ppc64le-41.iad2.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-41.iad2.fedoraproject.org
deleted file mode 100644
index 5b597d25e7..0000000000
--- a/inventory/host_vars/buildvm-ppc64le-41.iad2.fedoraproject.org
+++ /dev/null
@@ -1,4 +0,0 @@
----
-datacenter: iad2
-eth0_ipv4_ip: 10.3.171.81
-vmhost: bvmhost-p09-05.iad2.fedoraproject.org