diff --git a/inventory/builders b/inventory/builders
index 9078fe8871..234a50fc7d 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -73,9 +73,8 @@ buildvm-aarch64-18.arm.fedoraproject.org
 buildvm-aarch64-19.arm.fedoraproject.org
 buildvm-aarch64-20.arm.fedoraproject.org
 buildvm-aarch64-21.arm.fedoraproject.org
-# These two have been dropped to allow for osbs builders.
-#buildvm-aarch64-22.arm.fedoraproject.org
-#buildvm-aarch64-23.arm.fedoraproject.org
+buildvm-aarch64-22.arm.fedoraproject.org
+buildvm-aarch64-23.arm.fedoraproject.org
 buildvm-aarch64-24.arm.fedoraproject.org
 buildvm-aarch64-25.arm.fedoraproject.org
 
diff --git a/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org
index 7584287071..fce9785157 100644
--- a/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
-vmhost: aarch64-c22n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org
 eth0_ip: 10.5.129.172
 eth1_ip: 10.5.127.97
diff --git a/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org
index 30c78c7c01..8b412fd2e9 100644
--- a/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
-vmhost: aarch64-c23n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org
 eth0_ip: 10.5.129.173
 eth1_ip: 10.5.127.98
diff --git a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org
index ce7c5ceb35..8a65a828b4 100644
--- a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c22n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org
 eth0_ip: 10.5.129.176
diff --git a/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org
index ad8f634e6f..cb2ff304d4 100644
--- a/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c23n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org
 eth0_ip: 10.5.129.177
diff --git a/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org
index 05798cbae6..4ae33c1c15 100644
--- a/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c24n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-17.arm.fedoraproject.org
 eth0_ip: 10.5.129.178