diff --git a/inventory/builders b/inventory/builders
index 61ee41aa72..3f1a2e221c 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -59,23 +59,15 @@ buildvm-aarch64-20.arm.fedoraproject.org
 
 [buildvm-ppc64]
 buildvm-ppc64-01.ppc.fedoraproject.org
-buildvm-ppc64-02.ppc.fedoraproject.org
 buildvm-ppc64-03.ppc.fedoraproject.org
 buildvm-ppc64-04.ppc.fedoraproject.org
 buildvm-ppc64-05.ppc.fedoraproject.org
-buildvm-ppc64-06.ppc.fedoraproject.org
-buildvm-ppc64-07.ppc.fedoraproject.org
-buildvm-ppc64-08.ppc.fedoraproject.org
 
 [buildvm-ppc64le]
 buildvm-ppc64le-01.ppc.fedoraproject.org
-buildvm-ppc64le-02.ppc.fedoraproject.org
 buildvm-ppc64le-03.ppc.fedoraproject.org
 buildvm-ppc64le-04.ppc.fedoraproject.org
 buildvm-ppc64le-05.ppc.fedoraproject.org
-buildvm-ppc64le-06.ppc.fedoraproject.org
-buildvm-ppc64le-07.ppc.fedoraproject.org
-buildvm-ppc64le-08.ppc.fedoraproject.org
 
 [buildvm-s390]
 buildvm-s390-01.s390.fedoraproject.org
@@ -145,12 +137,24 @@ buildppc-01.phx2.fedoraproject.org
 buildppc-02.phx2.fedoraproject.org
 buildppc-03.phx2.fedoraproject.org
 buildppc-04.phx2.fedoraproject.org
+buildvm-ppc64-02.ppc.fedoraproject.org
+buildvm-ppc64-06.ppc.fedoraproject.org
+buildvm-ppc64-07.ppc.fedoraproject.org
+buildvm-ppc64-08.ppc.fedoraproject.org
+buildvm-ppc64-09.ppc.fedoraproject.org
+buildvm-ppc64-10.ppc.fedoraproject.org
 
 [buildppcle]
 buildppcle-01.phx2.fedoraproject.org
 buildppcle-02.phx2.fedoraproject.org
 buildppcle-03.phx2.fedoraproject.org
 buildppcle-04.phx2.fedoraproject.org
+buildvm-ppc64le-02.ppc.fedoraproject.org
+buildvm-ppc64le-06.ppc.fedoraproject.org
+buildvm-ppc64le-07.ppc.fedoraproject.org
+buildvm-ppc64le-08.ppc.fedoraproject.org
+buildvm-ppc64le-09.ppc.fedoraproject.org
+buildvm-ppc64le-10.ppc.fedoraproject.org
 
 [buildppc64]
 ppc8-04.ppc.fedoraproject.org
@@ -319,7 +323,9 @@ arm02-builder21.arm.fedoraproject.org
 arm02-builder23.arm.fedoraproject.org
 aarch64-02a.arm.fedoraproject.org
 buildvm-ppc64-01.ppc.fedoraproject.org
+buildvm-ppc64-02.ppc.fedoraproject.org
 buildvm-ppc64le-01.ppc.fedoraproject.org
+buildvm-ppc64le-02.ppc.fedoraproject.org
 
 [builders:children]
 buildhw
diff --git a/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org
index 472cc05dee..a964af209d 100644
--- a/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64-02.ppc.fedoraproject.org
@@ -1,3 +1,7 @@
 ---
 vmhost: ppc8-02.ppc.fedoraproject.org
 eth0_ip: 10.5.129.66
+eth1_ip: 10.5.127.10
+
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64-06.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-06.ppc.fedoraproject.org
index aff88d8cdf..e8e6544390 100644
--- a/inventory/host_vars/buildvm-ppc64-06.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64-06.ppc.fedoraproject.org
@@ -1,8 +1,7 @@
 ---
 vmhost: ppc8-02.ppc.fedoraproject.org
 eth0_ip: 10.5.129.70
+eth1_ip: 10.5.127.139
 
-koji_hub_nfs: "fedora_koji"
-koji_server_url: "http://koji.fedoraproject.org/kojihub"
-koji_weburl: "http://koji.fedoraproject.org/koji"
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org
index 21bdaa6f03..f523d06f60 100644
--- a/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64-07.ppc.fedoraproject.org
@@ -1,8 +1,7 @@
 ---
 vmhost: ppc8-03.ppc.fedoraproject.org
 eth0_ip: 10.5.129.71
+eth1_ip: 10.5.127.140
 
-koji_hub_nfs: "fedora_koji"
-koji_server_url: "http://koji.fedoraproject.org/kojihub"
-koji_weburl: "http://koji.fedoraproject.org/koji"
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org
index 64d60d0a46..ce339d1f23 100644
--- a/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64-08.ppc.fedoraproject.org
@@ -1,8 +1,7 @@
 ---
 vmhost: ppc8-01.ppc.fedoraproject.org
 eth0_ip: 10.5.129.72
+eth0_ip: 10.5.127.141
 
-koji_hub_nfs: "fedora_koji"
-koji_server_url: "http://koji.fedoraproject.org/kojihub"
-koji_weburl: "http://koji.fedoraproject.org/koji"
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org
new file mode 100644
index 0000000000..230e4f7170
--- /dev/null
+++ b/inventory/host_vars/buildvm-ppc64-09.ppc.fedoraproject.org
@@ -0,0 +1,7 @@
+---
+vmhost: ppc8-03.ppc.fedoraproject.org
+eth0_ip: 10.5.129.83
+eth1_ip: 10.5.127.143
+
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org
new file mode 100644
index 0000000000..2e786662d8
--- /dev/null
+++ b/inventory/host_vars/buildvm-ppc64-10.ppc.fedoraproject.org
@@ -0,0 +1,7 @@
+---
+vmhost: ppc8-02.ppc.fedoraproject.org
+eth0_ip: 10.5.129.82
+eth1_ip: 10.5.127.142
+
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org
index 78163e80cc..de1264751d 100644
--- a/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-02.ppc.fedoraproject.org
@@ -1,3 +1,7 @@
 ---
 vmhost: ppc8-02.ppc.fedoraproject.org
 eth0_ip: 10.5.129.73
+eth1_ip: 10.5.127.52
+
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64le-06.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-06.ppc.fedoraproject.org
index d8350e445e..a8790ad980 100644
--- a/inventory/host_vars/buildvm-ppc64le-06.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-06.ppc.fedoraproject.org
@@ -1,8 +1,7 @@
 ---
 vmhost: ppc8-02.ppc.fedoraproject.org
 eth0_ip: 10.5.129.77
+eth1_ip: 10.5.127.106
 
-koji_hub_nfs: "fedora_koji"
-koji_server_url: "http://koji.fedoraproject.org/kojihub"
-koji_weburl: "http://koji.fedoraproject.org/koji"
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org
index b40d50cf8e..a829cf232f 100644
--- a/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-07.ppc.fedoraproject.org
@@ -1,8 +1,7 @@
 ---
 vmhost: ppc8-03.ppc.fedoraproject.org
 eth0_ip: 10.5.129.78
+eth1_ip: 10.5.127.107
 
-koji_hub_nfs: "fedora_koji"
-koji_server_url: "http://koji.fedoraproject.org/kojihub"
-koji_weburl: "http://koji.fedoraproject.org/koji"
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org
index 62c8fd5887..df8eef132d 100644
--- a/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org
+++ b/inventory/host_vars/buildvm-ppc64le-08.ppc.fedoraproject.org
@@ -1,8 +1,7 @@
 ---
 vmhost: ppc8-01.ppc.fedoraproject.org
 eth0_ip: 10.5.129.79
+eth1_ip: 10.5.127.108
 
-koji_hub_nfs: "fedora_koji"
-koji_server_url: "http://koji.fedoraproject.org/kojihub"
-koji_weburl: "http://koji.fedoraproject.org/koji"
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org
new file mode 100644
index 0000000000..a67c490812
--- /dev/null
+++ b/inventory/host_vars/buildvm-ppc64le-09.ppc.fedoraproject.org
@@ -0,0 +1,7 @@
+---
+vmhost: ppc8-03.ppc.fedoraproject.org
+eth0_ip: 10.5.129.84
+eth1_ip: 10.5.127.109
+
+gw: 10.5.129.254
+main_bridge: br1
diff --git a/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org
new file mode 100644
index 0000000000..0b12ae3fe2
--- /dev/null
+++ b/inventory/host_vars/buildvm-ppc64le-10.ppc.fedoraproject.org
@@ -0,0 +1,7 @@
+---
+vmhost: ppc8-02.ppc.fedoraproject.org
+eth0_ip: 10.5.129.85
+eth1_ip: 10.5.127.110
+
+gw: 10.5.129.254
+main_bridge: br1