diff --git a/inventory/builders b/inventory/builders
index 2020fd0959..d54a7173df 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -165,6 +165,7 @@ bvmhost-p08-04.iad2.fedoraproject.org
 [buildhw]
 buildhw-a64-01.iad2.fedoraproject.org
 buildhw-x86-01.iad2.fedoraproject.org
+buildhw-x86-02.iad2.fedoraproject.org
 
 #
 # These are primary koji builders. 
diff --git a/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org
index 8499f94fbd..3f85f38279 100644
--- a/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-01.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.31
-gw: 10.3.169.254
+eth0_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org b/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org
index 1dc2a3c80e..8234e0e553 100644
--- a/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildhw-x64-02.iad2.fedoraproject.org
@@ -1,5 +1,5 @@
 ---
 eth0_ip: 10.3.169.32
-gw: 10.3.169.254
+eth0_gw: 10.3.169.254
 datacenter: iad2
 
diff --git a/inventory/inventory b/inventory/inventory
index a9844f20b5..2bec1583bc 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1081,6 +1081,8 @@ value01.iad2.fedoraproject.org
 # os-proxy02.fedorainfracloud.org
 
 [iad2]
+#openqa-a64-worker01.iad2.fedoraproject.org
+#openqa-stg01.iad2.fedoraproject.org
 autosign01.iad2.fedoraproject.org
 backup01.iad2.fedoraproject.org
 badges-backend01.iad2.fedoraproject.org
@@ -1092,6 +1094,8 @@ blockerbugs01.iad2.fedoraproject.org
 bodhi-backend01.iad2.fedoraproject.org
 bugzilla2fedmsg01.iad2.fedoraproject.org
 buildhw-a64-01.iad2.fedoraproject.org
+buildhw-x86-01.iad2.fedoraproject.org
+buildhw-x86-02.iad2.fedoraproject.org
 buildvm-a32-01.iad2.fedoraproject.org
 buildvm-a32-02.iad2.fedoraproject.org
 buildvm-a32-03.iad2.fedoraproject.org
@@ -1203,12 +1207,12 @@ bvmhost-a64-05.iad2.fedoraproject.org
 bvmhost-a64-06.iad2.fedoraproject.org
 bvmhost-a64-07.iad2.fedoraproject.org
 bvmhost-a64-08.iad2.fedoraproject.org
+bvmhost-p08-03.iad2.fedoraproject.org
+bvmhost-p08-04.iad2.fedoraproject.org
 bvmhost-p09-01.iad2.fedoraproject.org
 bvmhost-p09-02.iad2.fedoraproject.org
 bvmhost-p09-03.iad2.fedoraproject.org
 bvmhost-p09-04.iad2.fedoraproject.org
-bvmhost-p08-03.iad2.fedoraproject.org
-bvmhost-p08-04.iad2.fedoraproject.org
 bvmhost-x86-01.iad2.fedoraproject.org
 bvmhost-x86-02.iad2.fedoraproject.org
 bvmhost-x86-03.iad2.fedoraproject.org
@@ -1261,8 +1265,6 @@ oci-registry01.iad2.fedoraproject.org
 oci-registry02.iad2.fedoraproject.org
 odcs-backend01.iad2.fedoraproject.org
 odcs-frontend01.iad2.fedoraproject.org
-#openqa-a64-worker01.iad2.fedoraproject.org
-#openqa-stg01.iad2.fedoraproject.org
 openqa-x86-worker01.iad2.fedoraproject.org
 openqa01.iad2.fedoraproject.org
 os-control01.iad2.fedoraproject.org
@@ -1308,8 +1310,6 @@ vmhost-x86-05.iad2.fedoraproject.org
 vmhost-x86-06.iad2.fedoraproject.org
 vmhost-x86-07.iad2.fedoraproject.org
 wiki01.iad2.fedoraproject.org
-buildhw-a64-01.iad2.fedoraproject.org
-buildhw-x86-01.iad2.fedoraproject.org
 
 
 [iad2:vars]