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 d6ef3b0a15..1a8f2ba53a 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -160,21 +160,6 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
         option host-name "download05";
     }
 
-    host junk01 {
-    	 hardware ethernet e4:1f:13:2f:d4:94;
-	 fixed-address 10.5.126.7;
-	 next-server 10.5.126.41;
-	 option host-name "junk01";
-    }
-
-    host junk02 {
-    	 hardware ethernet e4:1f:13:64:1a:70;
-	 fixed-address 10.5.126.8;
-	 next-server 10.5.126.41;
-	 option host-name "junk02";
-    }
-
-
     host temp-install03 {
         hardware ethernet ac:f2:c5:ed:87:10;
 	fixed-address 10.5.126.167;
@@ -183,6 +168,13 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
         next-server 10.5.126.41;
     }
 
+    host data-analysis01 {
+        hardware ethernet 5c:f3:fc:4b:d5:6c;
+	fixed-address 10.5.126.121;
+	option host-name "data-analysis01.phx2.fedoraproject.org.";
+	filename "pxelinux.0";
+        next-server 10.5.126.41;
+    }
 
     range 10.5.126.170 10.5.126.175;
     next-server 10.5.126.41;
@@ -199,6 +191,12 @@ subnet 10.5.127.0 netmask 255.255.255.0 {
     option log-servers 10.5.126.29;
     range 10.5.127.230 10.5.127.239;
 
+    host data-analysis01-nfs {
+        hardware ethernet 5c:f3:fc:4b:d5:6e;
+	fixed-address 10.5.126.214;
+	filename "pxelinux.0";
+        next-server 10.5.126.41;
+    }
 
 }
 
@@ -235,17 +233,6 @@ subnet 10.5.130.0 netmask 255.255.255.0 {
         option host-name "bc01-mgmt";
     }
 
-    host junk01-mgmt {
-        hardware ethernet e4:1f:13:29:24:95;
-        fixed-address 10.5.130.235;
-        option host-name "junk01-mgmt";
-    }
-
-    host junk02-mgmt {
-        hardware ethernet e4:1f:13:29:24:95;
-        fixed-address 10.5.130.236;
-        option host-name "junk02-mgmt";
-    }
     host qa01-mgmt {
         hardware ethernet 00:21:5e:cb:4f:f1;
 	fixed-address 10.5.130.185;