diff --git a/inventory/inventory b/inventory/inventory
index 61685b2a0f..86df604d2d 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -931,7 +931,6 @@ qa09.qa.fedoraproject.org
 
 [virthost-comm]
 virthost-comm01.qa.fedoraproject.org
-virthost-comm02.qa.fedoraproject.org
 virthost-comm03.qa.fedoraproject.org
 virthost-comm04.qa.fedoraproject.org
 
diff --git a/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org
index a65f481771..90a6591978 100644
--- a/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.dhcp01.phx2.fedoraproject.org
@@ -150,15 +150,6 @@ subnet 10.5.125.0 netmask 255.255.255.0 {
 	filename "pxelinux.0";
     }
 
-
-    host bvirthost06 {
-        hardware ethernet 00:25:B5:FF:00:09;
-        fixed-address 10.5.125.120;
-        next-server 10.5.126.41;
-        option host-name "bvirthost06";
-	filename "pxelinux.0";
-    }
-
     host bvirthost07 {
         hardware ethernet 90:B1:1C:32:7E:8E;
         fixed-address 10.5.125.122;
@@ -175,38 +166,6 @@ subnet 10.5.125.0 netmask 255.255.255.0 {
 	filename "pxelinux.0";
     }
 
-    host bvirthost09 {
-        hardware ethernet 00:25:B5:FF:00:0F;
-        fixed-address 10.5.125.117;
-        next-server 10.5.126.41;
-        option host-name "bvirthost09";
-	filename "pxelinux.0";
-    }
-
-    host bvirthost10 {
-        hardware ethernet 00:25:B5:FF:00:0D;
-        fixed-address 10.5.125.118;
-        next-server 10.5.126.41;
-        option host-name "bvirthost10";
-	filename "pxelinux.0";
-    }
-
-    host bvirthost11 {
-        hardware ethernet 00:25:B5:FF:00:0B;
-        fixed-address 10.5.125.119;
-        next-server 10.5.126.41;
-        option host-name "bvirthost11";
-	filename "pxelinux.0";
-    }
-
-
-    host buildvmhost-10 {
-        hardware ethernet 00:25:B5:FF:00:03;
-        fixed-address 10.5.125.132;
-	next-server 10.5.125.43;
-        option host-name "buildvmhost-10";
-	filename "pxelinux.0";
-    }
 
     host buildhw-01 {
         hardware ethernet 14:9E:CF:61:9E:61;
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 df1c6d503c..b9431d1065 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -93,14 +93,6 @@ subnet 10.5.125.0 netmask 255.255.255.0 {
 	filename "pxelinux.0";
     }
 
-    host bvirthost03 {
-        hardware ethernet 00:25:B5:FF:00:01;
-        fixed-address 10.5.125.80;
-	next-server 10.5.125.43;
-        option host-name "bvirthost03";
-	filename "pxelinux.0";
-    }
-	 
     host bvirthost04 {
         hardware ethernet 18:66:DA:F7:61:58;
         fixed-address 10.5.125.76;
@@ -117,13 +109,6 @@ subnet 10.5.125.0 netmask 255.255.255.0 {
 	filename "pxelinux.0";
     }
 
-    host bvirthost06 {
-        hardware ethernet 00:25:B5:FF:00:09;
-        fixed-address 10.5.125.120;
-        next-server 10.5.126.41;
-        option host-name "bvirthost06";
-	filename "pxelinux.0";
-    }
 
     host bvirthost07 {
         hardware ethernet 90:B1:1C:32:7E:8E;
@@ -141,31 +126,6 @@ subnet 10.5.125.0 netmask 255.255.255.0 {
 	filename "pxelinux.0";
     }
 
-    host bvirthost09 {
-        hardware ethernet 00:25:B5:FF:00:0F;
-        fixed-address 10.5.125.117;
-        next-server 10.5.126.41;
-        option host-name "bvirthost09";
-	filename "pxelinux.0";
-    }
-
-    host bvirthost10 {
-        hardware ethernet 00:25:B5:FF:00:0D;
-        fixed-address 10.5.125.118;
-        next-server 10.5.126.41;
-        option host-name "bvirthost10";
-	filename "pxelinux.0";
-    }
-
-    host bvirthost11 {
-        hardware ethernet 00:25:B5:FF:00:0B;
-        fixed-address 10.5.125.119;
-        next-server 10.5.126.41;
-        option host-name "bvirthost11";
-	filename "pxelinux.0";
-    }
-
-
     host bvirthost12 {
     	 hardware ethernet 24:6E:96:B1:61:C4;
          fixed-address 10.5.125.10;