diff --git a/inventory/host_vars/qa02.qa.fedoraproject.org b/inventory/host_vars/qa02.qa.fedoraproject.org
index a4698fb80d..1b1fedf96b 100644
--- a/inventory/host_vars/qa02.qa.fedoraproject.org
+++ b/inventory/host_vars/qa02.qa.fedoraproject.org
@@ -13,22 +13,22 @@ volgroup: vmstore
 
 # beaker clients hosted on this machine
 clients:
-  - hostname: virt01.qa.fedoraproject.org
+  - hostname: beaker-client10.qa.fedoraproject.org
     macaddress: "52:54:00:a2:de:30"
     memsize: 4096
     num_cpus: 2
     lvm_size: 20G
-  - hostname: virt02.qa.fedoraproject.org
+  - hostname: beaker-client11.qa.fedoraproject.org
     macaddress: "52:54:00:fe:22:ff"
     memsize: 4096
     num_cpus: 2
     lvm_size: 20G
-  - hostname: virt03.qa.fedoraproject.org
+  - hostname: beaker-client12.qa.fedoraproject.org
     macaddress: "52:54:00:c5:04:14"
     memsize: 4096
     num_cpus: 2
     lvm_size: 20G
-  - hostname: virt04.qa.fedoraproject.org
+  - hostname: beaker-client13.qa.fedoraproject.org
     macaddress: "52:54:00:b5:97:30"
     memsize: 4096
     num_cpus: 2
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 d85793ef14..18e47ec0ea 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -1736,41 +1736,6 @@ shared-network qa {
 	     fixed-address 10.5.124.209;
         }
 
-    host virt01 {
-     hardware ethernet 52:54:00:a2:de:30;
-     fixed-address 10.5.124.159;
-        option host-name "virt01";
-        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        next-server 10.5.124.141;
-        filename "pxelinux.0";
-    }
-
-    host virt02 {
-     hardware ethernet 52:54:00:fe:22:ff;
-     fixed-address 10.5.124.160;
-        option host-name "virt02";
-        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        next-server 10.5.124.141;
-        filename "pxelinux.0";
-    }
-
-    host virt03 {
-     hardware ethernet 52:54:00:c5:04:14;
-     fixed-address 10.5.124.161;
-        option host-name "virt03";
-        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        next-server 10.5.124.141;
-        filename "pxelinux.0";
-    }
-
-    host virt04 {
-     hardware ethernet 52:54:00:b5:97:30;
-     fixed-address 10.5.124.162;
-        option host-name "virt04";
-        option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
-        next-server 10.5.124.141;
-        filename "pxelinux.0";
-    }
 
     host virt05 {
      hardware ethernet 52:54:00:9a:25:d3;
@@ -2068,6 +2033,42 @@ shared-network qa {
            filename "pxelinux.0";
         }
 
+        host beaker-client10 {
+        hardware ethernet 52:54:00:a2:de:30;
+        fixed-address 10.5.131.40;
+            option host-name "beaker-client10";
+            option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+            next-server 10.5.124.141;
+            filename "pxelinux.0";
+        }
+
+        host beaker-client11 {
+        hardware ethernet 52:54:00:fe:22:ff;
+        fixed-address 10.5.131.41;
+            option host-name "beaker-client11";
+            option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+            next-server 10.5.124.141;
+            filename "pxelinux.0";
+        }
+
+        host beaker-client12 {
+        hardware ethernet 52:54:00:c5:04:14;
+        fixed-address 10.5.131.42;
+            option host-name "beaker-client12";
+            option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+            next-server 10.5.124.141;
+            filename "pxelinux.0";
+        }
+
+        host beaker-client13 {
+        hardware ethernet 52:54:00:b5:97:30;
+        fixed-address 10.5.131.43;
+            option host-name "beaker-client13";
+            option ntp-servers 66.187.233.4, 192.43.244.18, 128.118.25.5, 204.152.184.72;
+            next-server 10.5.124.141;
+            filename "pxelinux.0";
+        }
+
        host retrace04 {
             hardware ethernet e4:1f:13:ba:ad:88;
 	    fixed-address 10.5.131.14;