diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index a5ee4e9d1d..686c0b62ea 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -125,7 +125,6 @@ iad2_management_hosts:
   - vmhost-x86-06.mgmt.iad2.fedoraproject.org
   - vmhost-x86-07.mgmt.iad2.fedoraproject.org
   - vmhost-x86-08.mgmt.iad2.fedoraproject.org
-  - vmhost-x86-09.mgmt.iad2.fedoraproject.org
   - bvmhost-a64-01-stg.mgmt.iad2.fedoraproject.org
   - bvmhost-x86-01-stg.mgmt.iad2.fedoraproject.org
   - bvmhost-x86-02-stg.mgmt.iad2.fedoraproject.org
@@ -133,7 +132,6 @@ iad2_management_hosts:
   - bvmhost-x86-05-stg.mgmt.iad2.fedoraproject.org
   - vmhost-x86-02-stg.mgmt.iad2.fedoraproject.org
   - vmhost-x86-03-stg.mgmt.iad2.fedoraproject.org
-  - vmhost-x86-04-stg.mgmt.iad2.fedoraproject.org
   - vmhost-x86-05-stg.mgmt.iad2.fedoraproject.org
   - vmhost-x86-06-stg.mgmt.iad2.fedoraproject.org
   - vmhost-x86-07-stg.mgmt.iad2.fedoraproject.org
diff --git a/inventory/hardware b/inventory/hardware
index 0e1bf2fc5a..4c3bccbf99 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -53,14 +53,15 @@ openqa-x86-worker03.iad2.fedoraproject.org
 openqa-x86-worker04.iad2.fedoraproject.org
 openqa-x86-worker05.iad2.fedoraproject.org
 openqa-x86-worker06.iad2.fedoraproject.org
+kernel01.iad2.fedoraproject.org
+kernel02.iad2.fedoraproject.org
 ## Virt
 vmhost-x86-01.iad2.fedoraproject.org
+vmhost-x86-01.stg.iad2.fedoraproject.org
 vmhost-x86-02.iad2.fedoraproject.org
 vmhost-x86-02.stg.iad2.fedoraproject.org
 vmhost-x86-03.iad2.fedoraproject.org
-vmhost-x86-03.stg.iad2.fedoraproject.org
 vmhost-x86-04.iad2.fedoraproject.org
-vmhost-x86-04.stg.iad2.fedoraproject.org
 vmhost-x86-05.iad2.fedoraproject.org
 vmhost-x86-05.stg.iad2.fedoraproject.org
 vmhost-x86-06.iad2.fedoraproject.org
@@ -68,6 +69,7 @@ vmhost-x86-06.stg.iad2.fedoraproject.org
 vmhost-x86-07.iad2.fedoraproject.org
 vmhost-x86-07.stg.iad2.fedoraproject.org
 vmhost-x86-08.stg.iad2.fedoraproject.org
+vmhost-x86-08.iad2.fedoraproject.org
 vmhost-x86-09.stg.iad2.fedoraproject.org
 vmhost-x86-11.stg.iad2.fedoraproject.org
 vmhost-x86-12.stg.iad2.fedoraproject.org
diff --git a/inventory/host_vars/kernel02.iad2.fedoraproject.org b/inventory/host_vars/kernel02.iad2.fedoraproject.org
new file mode 100644
index 0000000000..38fa706781
--- /dev/null
+++ b/inventory/host_vars/kernel02.iad2.fedoraproject.org
@@ -0,0 +1,7 @@
+---
+datacenter: iad2
+dns: 10.3.163.33
+eth0_ip: 10.3.174.130
+gw: 10.3.174.254
+nm: 255.255.255.0
+resolvconf: "resolv.conf/iad2"
diff --git a/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org
new file mode 100644
index 0000000000..e3496bd8b8
--- /dev/null
+++ b/inventory/host_vars/vmhost-x86-01.stg.iad2.fedoraproject.org
@@ -0,0 +1,42 @@
+---
+# This virthost only has stg instances, so it doesn't freeze
+br0_ipv4_ip: 10.3.166.11
+br0_ipv4_gw: 10.3.166.254
+br0_ipv4_nm: 24
+br0_port0_mac: "{{ mac3 }}"
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: "stg.iad2.fedoraproject.org"
+dns_search2: "iad2.fedoraproject.org"
+dns_search3: "fedoraproject.org"
+freezes: false
+has_ipv4: yes
+mac1: a8:3c:a5:36:2c:2c
+mac2: a8:3c:a5:36:2c:2d
+mac3: 6c:fe:54:88:f0:d4
+mac4: 6c:fe:54:88:f0:d5
+nested: true
+network_connections:
+  - autoconnect: yes
+    ip:
+      address:
+        - "{{ br0_ipv4_ip }}/{{ br0_ipv4_nm }}"
+      dhcp4: no
+      dns:
+        - "{{ dns1 }}"
+        - "{{ dns2 }}"
+      dns_search:
+        - "{{ dns_search1 }}"
+        - "{{ dns_search2 }}"
+        - "{{ dns_search3 }}"
+      gateway4: "{{ br0_ipv4_gw }}"
+    name: br0
+    state: up
+    type: bridge
+    mtu: 9000
+  - mac: "{{ br0_port0_mac }}"
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
+    mtu: 9000
diff --git a/inventory/inventory b/inventory/inventory
index eed0c60e1b..aa14d58eb2 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -231,6 +231,7 @@ download_iad2
 
 [kernel_qa]
 kernel01.iad2.fedoraproject.org
+kernel02.iad2.fedoraproject.org
 
 [koji]
 koji01.iad2.fedoraproject.org
@@ -674,9 +675,8 @@ sign-bridge01.stg.iad2.fedoraproject.org
 sign-vault01.stg.iad2.fedoraproject.org
 sundries01.stg.iad2.fedoraproject.org
 value02.stg.iad2.fedoraproject.org
+vmhost-x86-01.stg.iad2.fedoraproject.org
 vmhost-x86-02.stg.iad2.fedoraproject.org
-vmhost-x86-03.stg.iad2.fedoraproject.org
-vmhost-x86-04.stg.iad2.fedoraproject.org
 vmhost-x86-05.stg.iad2.fedoraproject.org
 vmhost-x86-06.stg.iad2.fedoraproject.org
 vmhost-x86-07.stg.iad2.fedoraproject.org
@@ -729,9 +729,8 @@ value02.iad2.fedoraproject.org
 value02.stg.iad2.fedoraproject.org
 
 [virthost]
+vmhost-x86-01.stg.iad2.fedoraproject.org
 vmhost-x86-02.stg.iad2.fedoraproject.org
-vmhost-x86-03.stg.iad2.fedoraproject.org
-vmhost-x86-04.stg.iad2.fedoraproject.org
 vmhost-x86-05.stg.iad2.fedoraproject.org
 vmhost-x86-06.stg.iad2.fedoraproject.org
 vmhost-x86-07.stg.iad2.fedoraproject.org
@@ -747,7 +746,6 @@ vmhost-x86-05.iad2.fedoraproject.org
 vmhost-x86-06.iad2.fedoraproject.org
 vmhost-x86-07.iad2.fedoraproject.org
 vmhost-x86-08.iad2.fedoraproject.org
-vmhost-x86-09.iad2.fedoraproject.org
 qvmhost-x86-01.iad2.fedoraproject.org
 qvmhost-x86-02.iad2.fedoraproject.org
 
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 a661416622..05874c4a9a 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -463,15 +463,6 @@ host vmhost-x86-08 {
      option routers 10.3.163.254;
      option subnet-mask 255.255.255.0;
 }
-host vmhost-x86-09 {
-     hardware ethernet 24:6E:96:B1:61:C0;
-     fixed-address 10.3.163.29;
-     filename "uefi/grubx64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.163.254;
-     option subnet-mask 255.255.255.0;
-}
-
 
 host openqa-x86-worker03 {
      hardware ethernet 24:6E:96:B0:E0:78;
@@ -600,7 +591,7 @@ host worker05-ocp-stg {
      option subnet-mask 255.255.255.0;
 }
 host vmhost-x86-01-stg {
-     hardware ethernet ec:f4:bb:d2:85:e8;
+     hardware ethernet 6c:fe:54:88:f0:d4;
      fixed-address 10.3.166.11;
      filename "uefi/grubx64.efi";
      next-server 10.3.163.10;
@@ -615,22 +606,6 @@ host vmhost-x86-02-stg {
      option routers 10.3.166.254;
      option subnet-mask 255.255.255.0;
 }
-host vmhost-x86-03-stg {
-     hardware ethernet 24:6E:96:05:D9:F8;
-     fixed-address 10.3.166.13;
-     filename "uefi/grubx64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.166.254;
-     option subnet-mask 255.255.255.0;
-}
-host vmhost-x86-04-stg {
-     hardware ethernet 24:6E:96:05:D7:80;
-     fixed-address 10.3.166.14;
-     filename "uefi/grubx64.efi";
-     next-server 10.3.163.10;
-     option routers 10.3.166.254;
-     option subnet-mask 255.255.255.0;
-}
 host vmhost-x86-05-stg {
      hardware ethernet A0:36:9F:DE:88:28;
      fixed-address 10.3.166.15;