diff --git a/inventory/hardware b/inventory/hardware
index 431f729540..c9bdd47295 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -157,6 +157,10 @@ buildvmhost-aarch64-16.arm.fedoraproject.org
 buildvmhost-aarch64-17.arm.fedoraproject.org
 buildvmhost-aarch64-18.arm.fedoraproject.org
 buildvmhost-a64-osbs-01.arm.fedoraproject.org
+openqa-aarch64-01.qa.fedoraproject.org
+openqa-aarch64-02.qa.fedoraproject.org
+openqa-aarch64-03.qa.fedoraproject.org
+openqa-aarch64-04.qa.fedoraproject.org
 
 [hardware:children]
 moonshot
diff --git a/inventory/inventory b/inventory/inventory
index a7e5a84909..d56d039fa4 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -518,6 +518,11 @@ aarch64-c27n1-oqa.arm.fedoraproject.org
 aarch64-c28n1-oqa.arm.fedoraproject.org
 aarch64-c29n1-oqa.arm.fedoraproject.org
 aarch64-c30n1-oqa.arm.fedoraproject.org
+openqa-aarch64-01.qa.fedoraproject.org
+openqa-aarch64-02.qa.fedoraproject.org
+openqa-aarch64-03.qa.fedoraproject.org
+openqa-aarch64-04.qa.fedoraproject.org
+
 
 # the workers that can run networked jobs. each server should have *one* of these per arch
 [openqa_tap_workers]
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
index c5e181df3e..9ce426e172 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -829,32 +829,32 @@ subnet 10.5.129.0 netmask 255.255.255.0 {
         filename "/uefi/grubaa64.efi";
     }
 
-    host openqa-aarch64-03-br0 {
+    host openqa-aarch64-01-eth1 {
         hardware ethernet 50:6b:4b:6a:c2:c0;
         fixed-address 10.5.129.243;
         next-server 10.5.126.41;
-        option host-name "openqa-aarch64-03-br0.arm.fedoraproject.org";
+        option host-name "openqa-aarch64-01-eth1.arm.fedoraproject.org";
         filename "/uefi/grubaa64.efi";
     }
-    host openqa-aarch64-04-br0 {
+    host openqa-aarch64-02-eth1 {
         hardware ethernet 50:6B:4B:6A:D3:C0;
         fixed-address 10.5.129.244;
         next-server 10.5.126.41;
-        option host-name "openqa-aarch64-04-br0.arm.fedoraproject.org";
+        option host-name "openqa-aarch64-02-eth1.arm.fedoraproject.org";
         filename "/uefi/grubaa64.efi";
     }
-    host openqa-aarch64-05-br0 {
+    host openqa-aarch64-03-eth1 {
         hardware ethernet 50:6B:4B:6B:0A:40;
         fixed-address 10.5.129.245;
         next-server 10.5.126.41;
-        option host-name "openqa-aarch64-05-br0.arm.fedoraproject.org";
+        option host-name "openqa-aarch64-03-eth1.arm.fedoraproject.org";
         filename "/uefi/grubaa64.efi";
     }
-    host openqa-aarch64-06-br0 {
+    host openqa-aarch64-04-eth1 {
         hardware ethernet 50:6B:4B:6A:C4:B0;
         fixed-address 10.5.129.246;
         next-server 10.5.126.41;
-        option host-name "openqa-aarch64-06-br0.arm.fedoraproject.org";
+        option host-name "openqa-aarch64-04-eth1.arm.fedoraproject.org";
         filename "/uefi/grubaa64.efi";
     }
 
@@ -1246,22 +1246,22 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
 	option host-name "buildvmhost-aarch64-17";
     }
 
-    host openqa-a64-03-mgmt {
+    host openqa-a64-01-mgmt {
         hardware ethernet E8:6A:64:97:6B:E0;
 	fixed-address 10.5.130.146;
 	option host-name "openqa-aarch64-03";
     }
-    host openqa-a64-04-mgmt {
+    host openqa-a64-02-mgmt {
         hardware ethernet E8:6A:64:39:18:67;
 	fixed-address 10.5.130.147;
 	option host-name "openqa-aarch64-04";
     }
-    host openqa-a64-05-mgmt {
+    host openqa-a64-03-mgmt {
         hardware ethernet E8:6A:64:39:18:85;
 	fixed-address 10.5.130.148;
 	option host-name "openqa-aarch64-05";
     }
-    host openqa-a64-06-mgmt {
+    host openqa-a64-04-mgmt {
         hardware ethernet E8:6A:64:39:19:62;
 	fixed-address 10.5.130.149;
 	option host-name "openqa-aarch64-06";
@@ -1964,28 +1964,28 @@ subnet 10.5.78.0 netmask 255.255.255.0 {
          next-server 10.5.126.41;
 	 filename "/uefi/grubaa64.efi";
     }
-    host openqa-aarch64-03  {
+    host openqa-aarch64-01  {
          hardware ethernet  68:05:CA:92:CB:12;
          fixed-address 10.5.78.243;
          option host-name "openqa-aarch64-03";
          next-server 10.5.126.41;
 	 filename "/uefi/grubaa64.efi";
     }
-    host openqa-aarch64-04  {
+    host openqa-aarch64-02  {
          hardware ethernet  68:05:CA:8A:F4:29;
          fixed-address 10.5.78.244;
          option host-name "openqa-aarch64-04";
          next-server 10.5.126.41;
 	 filename "/uefi/grubaa64.efi";
     }
-    host openqa-aarch64-05  {
+    host openqa-aarch64-03  {
          hardware ethernet  68:05:CA:8B:05:8C;
          fixed-address 10.5.78.245;
          option host-name "openqa-aarch64-05";
          next-server 10.5.126.41;
 	 filename "/uefi/grubaa64.efi";
     }
-    host openqa-aarch64-06  {
+    host openqa-aarch64-04  {
          hardware ethernet  68:05:CA:8A:F2:05;
          fixed-address 10.5.78.246;
          option host-name "openqa-aarch64-06";