diff --git a/inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org
index 26d60847bd..e117bf364e 100644
--- a/inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-aarch64-19.arm.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
-vmhost: aarch64-c19n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org
 eth0_ip: 10.5.129.169
 eth1_ip: 10.5.127.94
diff --git a/inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org
index 4e6062dbb7..4cde9d8929 100644
--- a/inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-aarch64-20.arm.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
-vmhost: aarch64-c20n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org
 eth0_ip: 10.5.129.170
 eth1_ip: 10.5.127.95
diff --git a/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org
index 391f8f203a..defbcb5577 100644
--- a/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
-vmhost: aarch64-c21n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org
 eth0_ip: 10.5.129.171
 eth1_ip: 10.5.127.96
diff --git a/inventory/host_vars/buildvm-armv7-19.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-19.arm.fedoraproject.org
index 5d2bde9c77..44893ece96 100644
--- a/inventory/host_vars/buildvm-armv7-19.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-19.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c19n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org
 eth0_ip: 10.5.129.149
diff --git a/inventory/host_vars/buildvm-armv7-20.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-20.arm.fedoraproject.org
index b5d89e5e1d..fea16f5339 100644
--- a/inventory/host_vars/buildvm-armv7-20.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-20.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c20n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org
 eth0_ip: 10.5.129.150
diff --git a/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org
index 4205b1faf2..cf0faeb882 100644
--- a/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c21n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-16.arm.fedoraproject.org
 eth0_ip: 10.5.129.175