diff --git a/inventory/builders b/inventory/builders
index 5fe938e21d..18ee9069d9 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -182,8 +182,6 @@ buildhw-aarch64-07.arm.fedoraproject.org
 buildhw-aarch64-08.arm.fedoraproject.org
 buildhw-aarch64-09.arm.fedoraproject.org
 buildhw-aarch64-10.arm.fedoraproject.org
-buildhw-aarch64-11.arm.fedoraproject.org
-buildhw-aarch64-12.arm.fedoraproject.org
 
 #
 # These are primary koji builders. 
diff --git a/inventory/host_vars/buildhw-aarch64-11.arm.fedoraproject.org b/inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org
similarity index 100%
rename from inventory/host_vars/buildhw-aarch64-11.arm.fedoraproject.org
rename to inventory/host_vars/openqa-aarch64-01.qa.fedoraproject.org
diff --git a/inventory/host_vars/buildhw-aarch64-12.arm.fedoraproject.org b/inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org
similarity index 100%
rename from inventory/host_vars/buildhw-aarch64-12.arm.fedoraproject.org
rename to inventory/host_vars/openqa-aarch64-02.qa.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index c4af150d51..94cb482881 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -601,16 +601,22 @@ openqa-stg01.qa.fedoraproject.org
 qa07.qa.fedoraproject.org
 qa09.qa.fedoraproject.org
 openqa-ppc64le-01.qa.fedoraproject.org
+# openqa-aarch64-01.qa.fedoraproject.org
+# openqa-aarch64-02.qa.fedoraproject.org
 
 # the workers that can run networked jobs. each server should have *one* of these per arch
 [openqa-tap-workers]
 qa14.qa.fedoraproject.org
 qa09.qa.fedoraproject.org
 openqa-ppc64le-01.qa.fedoraproject.org
+# openqa-aarch64-01.qa.fedoraproject.org
+# openqa-aarch64-02.qa.fedoraproject.org
 
 # the workers that need rw access to the factory share to run createhdds
 [openqa-hdds-workers]
 openqa-ppc64le-01.qa.fedoraproject.org
+# openqa-aarch64-01.qa.fedoraproject.org
+# openqa-aarch64-02.qa.fedoraproject.org
 
 [packages]
 packages03.phx2.fedoraproject.org