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 d61d9dc2e8..552880af51 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -849,3 +849,19 @@ host centos-mgmt01 {
      fixed-address 10.3.160.69;
      option host-name "centos01-mgmt";
 }
+
+host svault02-mgmt {
+     hardware ethernet D0:94:66:45:87:C5;
+     fixed-address 10.3.160.133;
+     option host-name "sign-vault02";
+}
+host dell-630-01-mgmt {
+     hardware ethernet 58:8A:5A:F3:9C:56;
+     fixed-address 10.3.160.31;
+     option host-name "bvirthost14";
+}
+host bkernel02-mgmt {
+     hardware ethernet D0:94:66:45:8C:13;
+     fixed-address 10.3.160.156;
+     option host-name "bkernel02";
+}
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 abf6c4be79..d3471876db 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -1015,11 +1015,6 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
         fixed-address 10.5.130.110;
         option host-name "p8-cloud02";
     }
-    host svault05-mgmt {
-        hardware ethernet D0:94:66:45:87:C5;
-        fixed-address 10.5.130.119;
-        option host-name "sign-vault05";
-    }
     host svault06-mgmt {
         hardware ethernet D0:94:66:45:A1:66;
         fixed-address 10.5.130.120;
@@ -1035,11 +1030,6 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
         fixed-address 10.5.130.122;
         option host-name "bvirthost13";
     }
-    host bvh14-mgmt {
-        hardware ethernet 58:8A:5A:F3:9C:56;
-        fixed-address 10.5.130.123;
-        option host-name "bvirthost14";
-    }
     host bvh15-mgmt {
         hardware ethernet 58:8A:5A:F3:A1:CE;
         fixed-address 10.5.130.124;
@@ -1227,11 +1217,6 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
         fixed-address 10.5.130.195;
         option host-name "virthost06";
     }
-    host bkernel03-mgmt {
-        hardware ethernet D0:94:66:45:8C:13;
-        fixed-address 10.5.130.198;
-        option host-name "bkernel03";
-    } 
     host bvirthost04-mgmt {
         hardware ethernet 84:7B:EB:F3:BC:7A;
         fixed-address 10.5.130.199;
@@ -1304,589 +1289,6 @@ subnet 10.5.79.0 netmask 255.255.255.0 {
     allow booting;
     allow bootp;
 
-    option domain-name "phx2.fedoraproject.org qa.fedoraproject.org fedoraproject.org";
-    option domain-name-servers 10.5.126.21, 10.5.126.22;
-    option routers 10.5.79.254;
-    option log-servers 10.5.126.29;
-
-    host arm01-builder00-mgmt {
-         hardware ethernet fc:2f:40:d2:27:6e;
-         fixed-address 10.5.79.10;
-         option host-name "arm01-builder00-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-retrace01-mgmt {
-         hardware ethernet fc:2f:40:d1:7a:3e;
-         fixed-address 10.5.79.11;
-         option host-name "arm01-retrace01-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder02-mgmt {
-         hardware ethernet fc:2f:40:ea:a7:a2;
-         fixed-address 10.5.79.12;
-         option host-name "arm01-builder02-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder03-mgmt {
-         hardware ethernet fc:2f:40:58:c6:fa;
-         fixed-address 10.5.79.13;
-         option host-name "arm01-builder03-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder04-mgmt {
-         hardware ethernet fc:2f:40:bd:c8:3e;
-         fixed-address 10.5.79.14;
-         option host-name "arm01-builder04-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder05-mgmt {
-         hardware ethernet fc:2f:40:c0:c3:6e;
-         fixed-address 10.5.79.15;
-         option host-name "arm01-builder05-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder06-mgmt {
-         hardware ethernet fc:2f:40:42:e5:5e;
-         fixed-address 10.5.79.16;
-         option host-name "arm01-builder06-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder07-mgmt {
-         hardware ethernet fc:2f:40:49:e0:2a;
-         fixed-address 10.5.79.17;
-         option host-name "arm01-builder07-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder08-mgmt {
-         hardware ethernet fc:2f:40:3c:2a:b6;
-         fixed-address 10.5.79.18;
-         option host-name "arm01-builder08-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder09-mgmt {
-         hardware ethernet fc:2f:40:b3:07:d6;
-         fixed-address 10.5.79.19;
-         option host-name "arm01-builder09-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder10-mgmt {
-         hardware ethernet fc:2f:40:b5:2e:22;
-         fixed-address 10.5.79.20;
-         option host-name "arm01-builder10-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder11-mgmt {
-         hardware ethernet fc:2f:40:ca:1e:ca;
-         fixed-address 10.5.79.21;
-         option host-name "arm01-builder11-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder12-mgmt {
-         hardware ethernet fc:2f:40:a4:6f:ea;
-         fixed-address 10.5.79.22;
-         option host-name "arm01-builder12-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder13-mgmt {
-         hardware ethernet fc:2f:40:5b:e0:2a;
-         fixed-address 10.5.79.23;
-         option host-name "arm01-builder13-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder14-mgmt {
-         hardware ethernet fc:2f:40:5e:ef:a6;
-         fixed-address 10.5.79.24;
-         option host-name "arm01-builder14-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder15-mgmt {
-         hardware ethernet fc:2f:40:dd:cb:b2;
-         fixed-address 10.5.79.25;
-         option host-name "arm01-builder15-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder16-mgmt {
-         hardware ethernet fc:2f:40:21:30:72;
-         fixed-address 10.5.79.26;
-         option host-name "arm01-builder16-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder17-mgmt {
-         hardware ethernet fc:2f:40:b5:7b:86;
-         fixed-address 10.5.79.27;
-         option host-name "arm01-builder17-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder18-mgmt {
-         hardware ethernet fc:2f:40:c9:7f:8e;
-         fixed-address 10.5.79.28;
-         option host-name "arm01-builder18-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder19-mgmt {
-         hardware ethernet fc:2f:40:56:23:be;
-         fixed-address 10.5.79.29;
-         option host-name "arm01-builder19-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder20-mgmt {
-         hardware ethernet fc:2f:40:a7:fa:7e;
-         fixed-address 10.5.79.30;
-         option host-name "arm01-builder20-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder21-mgmt {
-         hardware ethernet fc:2f:40:7b:8e:6e;
-         fixed-address 10.5.79.31;
-         option host-name "arm01-builder21-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder22-mgmt {
-         hardware ethernet fc:2f:40:75:79:fa;
-         fixed-address 10.5.79.32;
-         option host-name "arm01-builder22-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm01-builder23-mgmt {
-         hardware ethernet fc:2f:40:79:78:aa;
-         fixed-address 10.5.79.33;
-         option host-name "arm01-builder23-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder00-mgmt {
-         hardware ethernet fc:2f:40:71:53:9a;
-         fixed-address 10.5.79.40;
-         option host-name "arm02-builder00-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder01-mgmt {
-         hardware ethernet fc:2f:40:f4:24:7e;
-         fixed-address 10.5.79.41;
-         option host-name "arm02-builder01-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder02-mgmt {
-         hardware ethernet fc:2f:40:cd:2b:26;
-         fixed-address 10.5.79.42;
-         option host-name "arm02-builder02-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder03-mgmt {
-         hardware ethernet fc:2f:40:a9:d6:92;
-         fixed-address 10.5.79.43;
-         option host-name "arm02-builder03-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder04-mgmt {
-         hardware ethernet fc:2f:40:8a:9e:0e;
-         fixed-address 10.5.79.44;
-         option host-name "arm02-builder04-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder05-mgmt {
-         hardware ethernet fc:2f:40:6e:da:be;
-         fixed-address 10.5.79.45;
-         option host-name "arm02-builder05-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder06-mgmt {
-         hardware ethernet fc:2f:40:aa:0b:f6;
-         fixed-address 10.5.79.46;
-         option host-name "arm02-builder06-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder07-mgmt {
-         hardware ethernet fc:2f:40:db:ee:d2;
-         fixed-address 10.5.79.47;
-         option host-name "arm02-builder07-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder08-mgmt {
-         hardware ethernet fc:2f:40:2b:bd:02;
-         fixed-address 10.5.79.48;
-         option host-name "arm02-builder08-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder09-mgmt {
-         hardware ethernet fc:2f:40:cd:f1:b2;
-         fixed-address 10.5.79.49;
-         option host-name "arm02-builder09-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder10-mgmt {
-         hardware ethernet fc:2f:40:0c:08:e2;
-         fixed-address 10.5.79.50;
-         option host-name "arm02-builder10-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder11-mgmt {
-         hardware ethernet fc:2f:40:90:6d:22;
-         fixed-address 10.5.79.51;
-         option host-name "arm02-builder11-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder12-mgmt {
-         hardware ethernet fc:2f:40:40:d4:16;
-         fixed-address 10.5.79.52;
-         option host-name "arm02-builder12-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder13-mgmt {
-         hardware ethernet fc:2f:40:6b:07:3e;
-         fixed-address 10.5.79.53;
-         option host-name "arm02-builder13-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder14-mgmt {
-         hardware ethernet fc:2f:40:fc:ea:32;
-         fixed-address 10.5.79.54;
-         option host-name "arm02-builder14-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder15-mgmt {
-         hardware ethernet fc:2f:40:1a:26:ca;
-         fixed-address 10.5.79.55;
-         option host-name "arm02-builder15-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder16-mgmt {
-         hardware ethernet fc:2f:40:42:dd:2a;
-         fixed-address 10.5.79.56;
-         option host-name "arm02-builder16-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder17-mgmt {
-         hardware ethernet fc:2f:40:b2:71:d2;
-         fixed-address 10.5.79.57;
-         option host-name "arm02-builder17-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder18-mgmt {
-         hardware ethernet fc:2f:40:37:47:12;
-         fixed-address 10.5.79.58;
-         option host-name "arm02-builder18-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder19-mgmt {
-         hardware ethernet fc:2f:40:27:d6:3e;
-         fixed-address 10.5.79.59;
-         option host-name "arm02-builder19-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder20-mgmt {
-         hardware ethernet fc:2f:40:f2:2e:a6;
-         fixed-address 10.5.79.60;
-         option host-name "arm02-builder20-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder21-mgmt {
-         hardware ethernet fc:2f:40:36:64:6e;
-         fixed-address 10.5.79.61;
-         option host-name "arm02-builder21-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder22-mgmt {
-         hardware ethernet fc:2f:40:92:6f:7a;
-         fixed-address 10.5.79.62;
-         option host-name "arm02-builder22-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm02-builder23-mgmt {
-         hardware ethernet fc:2f:40:e0:cf:0e;
-         fixed-address 10.5.79.63;
-         option host-name "arm02-builder23-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-releng00-mgmt {
-         hardware ethernet fc:2f:40:1b:64:4e;
-         fixed-address 10.5.79.70;
-         option host-name "arm03-releng00-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-releng01-mgmt {
-         hardware ethernet fc:2f:40:08:d7:e2;
-         fixed-address 10.5.79.71;
-         option host-name "arm03-releng01-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-releng02-mgmt {
-         hardware ethernet fc:2f:40:a1:f8:36;
-         fixed-address 10.5.79.72;
-         option host-name "arm03-releng02-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-releng03-mgmt {
-         hardware ethernet fc:2f:40:1b:f6:da;
-         fixed-address 10.5.79.73;
-         option host-name "arm03-releng03-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-qa00-mgmt {
-         hardware ethernet fc:2f:40:16:c8:3a;
-         fixed-address 10.5.79.74;
-         option host-name "arm03-qa00-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-qa01-mgmt {
-         hardware ethernet fc:2f:40:9b:1d:da;
-         fixed-address 10.5.79.75;
-         option host-name "arm03-qa01-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-qa02-mgmt {
-         hardware ethernet fc:2f:40:00:4c:e2;
-         fixed-address 10.5.79.76;
-         option host-name "arm03-qa02-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-qa03-mgmt {
-         hardware ethernet fc:2f:40:57:cb:b6;
-         fixed-address 10.5.79.77;
-         option host-name "arm03-qa03-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder08-mgmt {
-         hardware ethernet fc:2f:40:12:6a:26;
-         fixed-address 10.5.79.78;
-         option host-name "arm03-builder08-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder09-mgmt {
-         hardware ethernet fc:2f:40:5d:85:8a;
-         fixed-address 10.5.79.79;
-         option host-name "arm03-builder09-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder10-mgmt {
-         hardware ethernet fc:2f:40:a5:5f:42;
-         fixed-address 10.5.79.80;
-         option host-name "arm03-builder10-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder11-mgmt {
-         hardware ethernet fc:2f:40:d2:a1:0e;
-         fixed-address 10.5.79.81;
-         option host-name "arm03-builder11-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder12-mgmt {
-         hardware ethernet fc:2f:40:00:a4:c6;
-         fixed-address 10.5.79.82;
-         option host-name "arm03-builder12-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder13-mgmt {
-         hardware ethernet fc:2f:40:59:27:ba;
-         fixed-address 10.5.79.83;
-         option host-name "arm03-builder13-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder14-mgmt {
-         hardware ethernet fc:2f:40:7b:ab:f6;
-         fixed-address 10.5.79.84;
-         option host-name "arm03-builder14-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder15-mgmt {
-         hardware ethernet fc:2f:40:8a:99:96;
-         fixed-address 10.5.79.85;
-         option host-name "arm03-builder15-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder16-mgmt {
-         hardware ethernet fc:2f:40:ea:ff:16;
-         fixed-address 10.5.79.86;
-         option host-name "arm03-builder16-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder17-mgmt {
-         hardware ethernet fc:2f:40:79:e3:8e;
-         fixed-address 10.5.79.87;
-         option host-name "arm03-builder17-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder18-mgmt {
-         hardware ethernet fc:2f:40:7d:0c:9a;
-         fixed-address 10.5.79.88;
-         option host-name "arm03-builder18-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder19-mgmt {
-         hardware ethernet fc:2f:40:04:29:9a;
-         fixed-address 10.5.79.89;
-         option host-name "arm03-builder19-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder20-mgmt {
-         hardware ethernet fc:2f:40:3c:50:26;
-         fixed-address 10.5.79.90;
-         option host-name "arm03-builder20-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder21-mgmt {
-         hardware ethernet fc:2f:40:cb:4f:66;
-         fixed-address 10.5.79.91;
-         option host-name "arm03-builder21-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder22-mgmt {
-         hardware ethernet fc:2f:40:17:c0:ee;
-         fixed-address 10.5.79.92;
-         option host-name "arm03-builder22-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm03-builder23-mgmt {
-         hardware ethernet fc:2f:40:00:47:3e;
-         fixed-address 10.5.79.93;
-         option host-name "arm03-builder23-mgmt";
-         next-server 10.5.126.41;
-    }
-
-    host arm04-builder00-mgmt {
-         hardware ethernet fc:2f:40:7b:48:c6;
-         fixed-address 10.5.79.100;
-         option host-name "arm04-builder00-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder01-mgmt {
-         hardware ethernet fc:2f:40:fc:11:6a;
-         fixed-address 10.5.79.101;
-         option host-name "arm04-builder01-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder02-mgmt {
-         hardware ethernet fc:2f:40:5a:e9:b2;
-         fixed-address 10.5.79.102;
-         option host-name "arm04-builder02-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder03-mgmt {
-         hardware ethernet fc:2f:40:a6:b5:42;
-         fixed-address 10.5.79.103;
-         option host-name "arm04-builder03-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder04-mgmt {
-         hardware ethernet fc:2f:40:5e:e0:96;
-         fixed-address 10.5.79.104;
-         option host-name "arm04-builder04-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder05-mgmt {
-         hardware ethernet fc:2f:40:9d:9e:6a;
-         fixed-address 10.5.79.105;
-         option host-name "arm04-builder05-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder06-mgmt {
-         hardware ethernet fc:2f:40:ac:53:e6;
-         fixed-address 10.5.79.106;
-         option host-name "arm04-builder06-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder07-mgmt {
-         hardware ethernet fc:2f:40:9d:d3:22;
-         fixed-address 10.5.79.107;
-         option host-name "arm04-builder07-mgmt";
-        next-server 10.5.126.41;
-    }
-    host arm04-builder08-mgmt {
-         hardware ethernet fc:2f:40:97:c9:26;
-         fixed-address 10.5.79.108;
-         option host-name "arm04-builder08-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder09-mgmt {
-         hardware ethernet fc:2f:40:54:35:8a;
-         fixed-address 10.5.79.109;
-         option host-name "arm04-builder09-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder10-mgmt {
-         hardware ethernet fc:2f:40:7c:88:22;
-         fixed-address 10.5.79.110;
-         option host-name "arm04-builder10-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder11-mgmt {
-         hardware ethernet fc:2f:40:73:09:ba;
-         fixed-address 10.5.79.111;
-         option host-name "arm04-builder11-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder12-mgmt {
-         hardware ethernet fc:2f:40:92:70:2e;
-         fixed-address 10.5.79.112;
-         option host-name "arm04-builder12-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder13-mgmt {
-         hardware ethernet fc:2f:40:84:77:a2;
-         fixed-address 10.5.79.113;
-         option host-name "arm04-builder13-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder14-mgmt {
-         hardware ethernet fc:2f:40:e7:53:2e;
-         fixed-address 10.5.79.114;
-         option host-name "arm04-builder14-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder15-mgmt {
-         hardware ethernet fc:2f:40:69:82:56;
-         fixed-address 10.5.79.115;
-         option host-name "arm04-builder15-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder16-mgmt {
-         hardware ethernet fc:2f:40:09:12:fa;
-         fixed-address 10.5.79.116;
-         option host-name "arm04-builder16-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder17-mgmt {
-         hardware ethernet fc:2f:40:9c:4f:36;
-         fixed-address 10.5.79.117;
-         option host-name "arm04-builder17-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder18-mgmt {
-         hardware ethernet fc:2f:40:2c:f4:ae;
-         fixed-address 10.5.79.118;
-         option host-name "arm04-builder18-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder19-mgmt {
-         hardware ethernet fc:2f:40:df:6e:06;
-         fixed-address 10.5.79.119;
-         option host-name "arm04-builder19-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder20-mgmt {
-         hardware ethernet fc:2f:40:61:05:32;
-         fixed-address 10.5.79.120;
-         option host-name "arm04-builder20-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder21-mgmt {
-         hardware ethernet fc:2f:40:7a:96:da;
-         fixed-address 10.5.79.121;
-         option host-name "arm04-builder21-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder22-mgmt {
-         hardware ethernet fc:2f:40:a1:73:be;
-         fixed-address 10.5.79.122;
-         option host-name "arm04-builder22-mgmt";
-         next-server 10.5.126.41;
-    }
-    host arm04-builder23-mgmt {
-         hardware ethernet fc:2f:40:fd:2f:5e;
-         fixed-address 10.5.79.123;
-         option host-name "arm04-builder23-mgmt";
-         next-server 10.5.126.41;
-    }
-}
 
 # ARM VLAN
 subnet 10.5.78.0 netmask 255.255.255.0 {
@@ -2729,9 +2131,9 @@ shared-network qa {
           filename "pxelinux.0";
         }
 
-        host kernel03 {
-          hardware ethernet d0:94:66:7c:b2:e3;
-           fixed-address 10.5.131.177;
+host kernel03 {
+     hardware ethernet d0:94:66:7c:b2:e3;
+     fixed-address 10.5.131.177;
            option host-name "kernel03";
            option ntp-servers 10.5.126.21, 10.5.126.22;
            next-server 10.5.126.41;