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 272025f553..86ae5e164e 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -1116,85 +1116,85 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
         option host-name "dell-fxqa01-03";
     }
 
-    host buildvmhost-aarch64-10 {
+    host buildvmhost-a64-10-mgmt {
         hardware ethernet E8:6A:64:39:18:C3;
 	fixed-address 10.5.130.130;
 	option host-name "buildvmhost-aarch64-10";
     }
 
-    host buildvmhost-aarch64-11 {
+    host buildvmhost-a64-11-mgmt {
         hardware ethernet E8:6A:64:39:18:B2;
 	fixed-address 10.5.130.131;
 	option host-name "buildvmhost-aarch64-11";
     }
 
-    host buildvmhost-aarch64-12 {
+    host buildvmhost-a64-12-mgmt {
         hardware ethernet E8:6A:64:39:19:68;
 	fixed-address 10.5.130.132;
 	option host-name "buildvmhost-aarch64-12";
     }
 
-    host buildvmhost-aarch64-13 {
+    host buildvmhost-a64-13-mgmt {
         hardware ethernet E8:6A:64:39:18:63;
 	fixed-address 10.5.130.133;
 	option host-name "buildvmhost-aarch64-13";
     }
 
-    host buildvmhost-aarch64-14 {
+    host buildvmhost-a64-14-mgmt {
         hardware ethernet E8:6A:64:39:18:63;
 	fixed-address 10.5.130.134;
 	option host-name "buildvmhost-aarch64-14";
     }
 
-    host buildvmhost-aarch64-15 {
+    host buildvmhost-a64-15-mgmt {
         hardware ethernet E8:6A:64:39:18:60;
 	fixed-address 10.5.130.135;
 	option host-name "buildvmhost-aarch64-15";
     }
 
-    host buildvmhost-aarch64-16 {
+    host buildvmhost-a64-16-mgmt {
         hardware ethernet E8:6A:64:39:19:35;
 	fixed-address 10.5.130.136;
 	option host-name "buildvmhost-aarch64-16";
     }
 
-    host buildvmhost-aarch64-17 {
+    host buildvmhost-a64-17-mgmt {
         hardware ethernet E8:6A:64:97:6B:E0;
 	fixed-address 10.5.130.137;
 	option host-name "buildvmhost-aarch64-17";
     }
 
-    host buildvmhost-aarch64-18 {
+    host buildvmhost-a64-18-mgmt {
         hardware ethernet E8:6A:64:39:18:CB;
 	fixed-address 10.5.130.138;
 	option host-name "buildvmhost-aarch64-18";
     }
 
-    host buildvmhost-aarch64-19 {
+    host buildvmhost-a64-19-mgmt {
         hardware ethernet E8:6A:64:39:19:69;
 	fixed-address 10.5.130.139;
 	option host-name "buildvmhost-aarch64-19";
     }
 
-    host buildvmhost-aarch64-20 {
+    host buildvmhost-a64-20-mgmt {
         hardware ethernet E8:6A:64:39:18:67;
 	fixed-address 10.5.130.140;
 	option host-name "buildvmhost-aarch64-20";
     }
 
-    host buildvmhost-aarch64-21 {
+    host buildvmhost-a64-21-mgmt {
         hardware ethernet E8:6A:64:39:18:85;
 	fixed-address 10.5.130.141;
 	option host-name "buildvmhost-aarch64-21";
     }
 
-    host buildvmhost-aarch64-22 {
+    host buildvmhost-a64-22-mgmt {
         hardware ethernet E8:6A:64:39:18:B3;
 	fixed-address 10.5.130.142;
 	option host-name "buildvmhost-aarch64-22";
     }
 
-    host buildvmhost-aarch64-23 {
+    host buildvmhost-a64-23-mgmt {
         hardware ethernet E8:6A:64:39:19:62;
 	fixed-address 10.5.130.143;
 	option host-name "buildvmhost-aarch64-23";