diff --git a/inventory/hardware b/inventory/hardware
index c9bdd47295..0bb0b17563 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -157,10 +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
+#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/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
index 7817ad6f2c..2f732fb298 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -829,7 +829,7 @@ subnet 10.5.129.0 netmask 255.255.255.0 {
         filename "/uefi/grubaa64.efi";
     }
 
-    host openqa-aarch64-01-eth1 {
+    host bvh-aarch64-19-br0 {
         hardware ethernet 50:6b:4b:6a:c2:c0;
         fixed-address 10.5.129.243;
         next-server 10.5.126.41;
@@ -1246,15 +1246,9 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
 	option host-name "buildvmhost-aarch64-18";
     }
     host buildvmhost-a64-19-mgmt {
-        hardware ethernet E8:6A:64:97:6B:49;
-	fixed-address 10.5.130.143;
-	option host-name "buildvmhost-aarch64-18";
-    }
-
-    host openqa-a64-01-mgmt {
         hardware ethernet E8:6A:64:97:6B:E0;
-	fixed-address 10.5.130.146;
-	option host-name "openqa-aarch64-01";
+	fixed-address 10.5.130.140;
+	option host-name "buildvmhost-aarch64-19";
     }
     host openqa-a64-02-mgmt {
         hardware ethernet E8:6A:64:39:18:67;
@@ -1281,6 +1275,12 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
 	fixed-address 10.5.130.142;
 	option host-name "tbc-aarch64-08";
     }
+    host tbc-a64-09-mgmt {
+        hardware ethernet E8:6A:64:97:6B:49;
+	fixed-address 10.5.130.143;
+	option host-name "buildvmhost-aarch64-19";
+    }
+
 
 
 
@@ -1957,27 +1957,13 @@ subnet 10.5.78.0 netmask 255.255.255.0 {
 	 filename "/uefi/grubaa64.efi";
     }
     host buildvmhost-aarch64-19  {
-         hardware ethernet 00:1B:21:E0:78:B2;
+         hardware ethernet  68:05:CA:92:CB:12;
          fixed-address 10.5.78.3;
-         option host-name "buildvmhost-aarch64-19";
+         option host-name "buildvmhost-aarch64-03";
          next-server 10.5.126.41;
 	 filename "/uefi/grubaa64.efi";
     }
 
-    host tbc-aarch64-00 {
-         hardware ethernet 00:1B:21:E0:6E:5B;
-         fixed-address 10.5.78.240;
-         option host-name "tbc-aarch64-00";
-         next-server 10.5.126.41;
-	 filename "/uefi/grubaa64.efi";
-    }
-    host openqa-aarch64-01  {
-         hardware ethernet  68:05:CA:92:CB:12;
-         fixed-address 10.5.78.6;
-         option host-name "openqa-aarch64-03";
-         next-server 10.5.126.41;
-	 filename "/uefi/grubaa64.efi";
-    }
     host openqa-aarch64-02  {
          hardware ethernet  68:05:CA:8A:F4:29;
          fixed-address 10.5.78.7;
@@ -2000,6 +1986,20 @@ subnet 10.5.78.0 netmask 255.255.255.0 {
 	 filename "/uefi/grubaa64.efi";
     }
 
+    host tbc-aarch64-00 {
+         hardware ethernet 00:1B:21:E0:6E:5B;
+         fixed-address 10.5.78.240;
+         option host-name "tbc-aarch64-00";
+         next-server 10.5.126.41;
+	 filename "/uefi/grubaa64.efi";
+    }
+    host tbc-aarch64-09  {
+         hardware ethernet 00:1B:21:E0:78:B2;
+         fixed-address 10.5.78.249;
+         option host-name "tbc-aarch64-19";
+         next-server 10.5.126.41;
+	 filename "/uefi/grubaa64.efi";
+    }
 
 
     host arm01-releng02 {