diff --git a/inventory/hardware b/inventory/hardware
index ad3ffcac3f..8d1dd6c193 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -139,10 +139,10 @@ bvmhost-a64-01.iad2.fedoraproject.org
 bvmhost-a64-02.iad2.fedoraproject.org
 bvmhost-a64-03.iad2.fedoraproject.org
 bvmhost-a64-04.iad2.fedoraproject.org
-bvmhost-a64-12.iad2.fedoraproject.org
-bvmhost-a64-13.iad2.fedoraproject.org
-bvmhost-a64-14.iad2.fedoraproject.org
-bvmhost-a64-15.iad2.fedoraproject.org
+buildhw-a64-03.iad2.fedoraproject.org
+buildhw-a64-04.iad2.fedoraproject.org
+buildhw-a64-05.iad2.fedoraproject.org
+buildhw-a64-06.iad2.fedoraproject.org
 openqa-a64-worker04.iad2.fedoraproject.org
 
 [hardware:children]
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
index 4c411d3437..bbbbff45e1 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -1678,64 +1678,64 @@ host bvmhost-p09-05-mgmt {
      option host-name "bvmhost-p09-05-mgmt";
 }
 
-host bvmhost-a64-12-mgmt {
+host buildhw-a64-03-mgmt {
      hardware ethernet d8:5e:d3:8b:5f:72;
      fixed-address 10.3.160.80;
-     option host-name "bvmhost-a64-12-mgmt";
+     option host-name "buildhw-a64-03-mgmt";
 }
 
-host bvmhost-a64-12 {
+host buildhw-a64-03 {
      hardware ethernet 0c:42:a1:4a:0b:f4;
-     fixed-address 10.3.170.23;
-     option host-name "bvmhost-a64-12";
+     fixed-address 10.3.170.123;
+     option host-name "buildhw-a64-03";
      filename "uefi/grubaa64.efi";
      next-server 10.3.163.10;
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
 
-host bvmhost-a64-13-mgmt {
+host buildhw-a64-04-mgmt {
      hardware ethernet d8:5e:d3:8b:5d:da;
      fixed-address 10.3.160.81;
-     option host-name "bvmhost-a64-13-mgmt";
+     option host-name "buildhw-a64-04-mgmt";
 }
 
-host bvmhost-a64-13 {
+host buildhw-a64-04 {
      hardware ethernet 0c:42:a1:49:9b:d0;
-     fixed-address 10.3.170.24;
-     option host-name "bvmhost-a64-13";
+     fixed-address 10.3.170.124;
+     option host-name "buildhw-a64-04";
      filename "uefi/grubaa64.efi";
      next-server 10.3.163.10;
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
 
-host bvmhost-a64-14-mgmt {
+host buildhw-a64-05-mgmt {
      hardware ethernet d8:5e:d3:8b:89:6e;
      fixed-address 10.3.160.82;
-     option host-name "bvmhost-a64-14-mgmt";
+     option host-name "buildhw-a64-05-mgmt";
 }
 
-host bvmhost-a64-14 {
+host buildhw-a64-05 {
      hardware ethernet 0c:42:a1:5a:00:b8;
-     fixed-address 10.3.170.25;
-     option host-name "bvmhost-a64-14";
+     fixed-address 10.3.170.125;
+     option host-name "buildhw-a64-05";
      filename "uefi/grubaa64.efi";
      next-server 10.3.163.10;
      option routers 10.3.170.254;
      option subnet-mask 255.255.255.0;
 }
 
-host bvmhost-a64-15-mgmt {
+host buildhw-a64-06-mgmt {
      hardware ethernet d8:5e:d3:8b:5f:3a;
      fixed-address 10.3.160.83;
-     option host-name "bvmhost-a64-15-mgmt";
+     option host-name "buildhw-a64-06-mgmt";
 }
 
-host bvmhost-a64-15 {
+host buildhw-a64-06 {
      hardware ethernet 0c:42:a1:45:6c:fc;
-     fixed-address 10.3.170.26;
-     option host-name "bvmhost-a64-15";
+     fixed-address 10.3.170.126;
+     option host-name "buildhw-a64-06";
      filename "uefi/grubaa64.efi";
      next-server 10.3.163.10;
      option routers 10.3.170.254;