diff --git a/inventory/host_vars/bvirthost06.phx2.fedoraproject.org b/inventory/group_vars/buildvmhost
similarity index 100%
rename from inventory/host_vars/bvirthost06.phx2.fedoraproject.org
rename to inventory/group_vars/buildvmhost
diff --git a/inventory/group_vars/bvirthost b/inventory/group_vars/bvirthost
index d7aff060d9..dc744414a3 100644
--- a/inventory/group_vars/bvirthost
+++ b/inventory/group_vars/bvirthost
@@ -1,2 +1,4 @@
 ---
 virthost: true
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
diff --git a/inventory/group_vars/virthost b/inventory/group_vars/virthost
index d7aff060d9..b59341006e 100644
--- a/inventory/group_vars/virthost
+++ b/inventory/group_vars/virthost
@@ -1,2 +1,9 @@
 ---
+# iscsi initiator for netapp iscsi volume
+netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
+# iscsi portal for netapp iscsi volume
+netapp_nfs01_iscsi_portal: 10.5.88.36
+
 virthost: true
+nrpe_procs_warn: 900
+nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/bvirthost07.phx2.fedoraproject.org b/inventory/group_vars/virthost-comm
similarity index 100%
rename from inventory/host_vars/bvirthost07.phx2.fedoraproject.org
rename to inventory/group_vars/virthost-comm
diff --git a/inventory/host_vars/bvirthost08.phx2.fedoraproject.org b/inventory/host_vars/bvirthost08.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/bvirthost08.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/bvirthost09.phx2.fedoraproject.org b/inventory/host_vars/bvirthost09.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/bvirthost09.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/bvirthost10.phx2.fedoraproject.org b/inventory/host_vars/bvirthost10.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/bvirthost10.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/bvirthost11.phx2.fedoraproject.org b/inventory/host_vars/bvirthost11.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/bvirthost11.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost-comm01.qa.fedoraproject.org b/inventory/host_vars/virthost-comm01.qa.fedoraproject.org
index 3d8f2c30da..9342178f79 100644
--- a/inventory/host_vars/virthost-comm01.qa.fedoraproject.org
+++ b/inventory/host_vars/virthost-comm01.qa.fedoraproject.org
@@ -1,2 +1,3 @@
 ---
+# This virthost only has non release critical instances, so it doesn't freeze
 freezes: false
diff --git a/inventory/host_vars/virthost-comm02.qa.fedoraproject.org b/inventory/host_vars/virthost-comm02.qa.fedoraproject.org
index 3296ee3fe4..9342178f79 100644
--- a/inventory/host_vars/virthost-comm02.qa.fedoraproject.org
+++ b/inventory/host_vars/virthost-comm02.qa.fedoraproject.org
@@ -1,4 +1,3 @@
 ---
-freezes: falses
-nrpe_procs_warn: 700
-nrpe_procs_crit: 800
+# This virthost only has non release critical instances, so it doesn't freeze
+freezes: false
diff --git a/inventory/host_vars/virthost-comm03.qa.fedoraproject.org b/inventory/host_vars/virthost-comm03.qa.fedoraproject.org
index 3296ee3fe4..9342178f79 100644
--- a/inventory/host_vars/virthost-comm03.qa.fedoraproject.org
+++ b/inventory/host_vars/virthost-comm03.qa.fedoraproject.org
@@ -1,4 +1,3 @@
 ---
-freezes: falses
-nrpe_procs_warn: 700
-nrpe_procs_crit: 800
+# This virthost only has non release critical instances, so it doesn't freeze
+freezes: false
diff --git a/inventory/host_vars/virthost-comm04.qa.fedoraproject.org b/inventory/host_vars/virthost-comm04.qa.fedoraproject.org
index 3296ee3fe4..9342178f79 100644
--- a/inventory/host_vars/virthost-comm04.qa.fedoraproject.org
+++ b/inventory/host_vars/virthost-comm04.qa.fedoraproject.org
@@ -1,4 +1,3 @@
 ---
-freezes: falses
-nrpe_procs_warn: 700
-nrpe_procs_crit: 800
+# This virthost only has non release critical instances, so it doesn't freeze
+freezes: false
diff --git a/inventory/host_vars/virthost01.phx2.fedoraproject.org b/inventory/host_vars/virthost01.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost02.phx2.fedoraproject.org b/inventory/host_vars/virthost02.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/virthost02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost03.phx2.fedoraproject.org b/inventory/host_vars/virthost03.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost03.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost05.phx2.fedoraproject.org b/inventory/host_vars/virthost05.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost05.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost06.phx2.fedoraproject.org b/inventory/host_vars/virthost06.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost06.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost07.phx2.fedoraproject.org b/inventory/host_vars/virthost07.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost07.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost08.phx2.fedoraproject.org b/inventory/host_vars/virthost08.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost08.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost09.phx2.fedoraproject.org b/inventory/host_vars/virthost09.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost09.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost10.phx2.fedoraproject.org b/inventory/host_vars/virthost10.phx2.fedoraproject.org
index c70398238f..92cc5c0e3a 100644
--- a/inventory/host_vars/virthost10.phx2.fedoraproject.org
+++ b/inventory/host_vars/virthost10.phx2.fedoraproject.org
@@ -1,5 +1,3 @@
 ---
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-
+# This virthost only has stg instances, so it doesn't freeze
 freezes: false
diff --git a/inventory/host_vars/virthost11.phx2.fedoraproject.org b/inventory/host_vars/virthost11.phx2.fedoraproject.org
index d34cfdb7b6..92cc5c0e3a 100644
--- a/inventory/host_vars/virthost11.phx2.fedoraproject.org
+++ b/inventory/host_vars/virthost11.phx2.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
+# This virthost only has stg instances, so it doesn't freeze
+freezes: false
diff --git a/inventory/host_vars/virthost12.phx2.fedoraproject.org b/inventory/host_vars/virthost12.phx2.fedoraproject.org
index c70398238f..92cc5c0e3a 100644
--- a/inventory/host_vars/virthost12.phx2.fedoraproject.org
+++ b/inventory/host_vars/virthost12.phx2.fedoraproject.org
@@ -1,5 +1,3 @@
 ---
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
-
+# This virthost only has stg instances, so it doesn't freeze
 freezes: false
diff --git a/inventory/host_vars/virthost14.phx2.fedoraproject.org b/inventory/host_vars/virthost14.phx2.fedoraproject.org
deleted file mode 100644
index a6da5790e6..0000000000
--- a/inventory/host_vars/virthost14.phx2.fedoraproject.org
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# iscsi initiator for netapp iscsi volume
-netapp_nfs01_iscsi_name: iqn.1992-08.com.netapp:sn.1573980325:vf.f88732f4-106e-11e2-bc86-00a098162a28
-# iscsi portal for netapp iscsi volume
-netapp_nfs01_iscsi_portal: 10.5.88.36
-
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost15.phx2.fedoraproject.org b/inventory/host_vars/virthost15.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/virthost15.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost16.phx2.fedoraproject.org b/inventory/host_vars/virthost16.phx2.fedoraproject.org
index d34cfdb7b6..92cc5c0e3a 100644
--- a/inventory/host_vars/virthost16.phx2.fedoraproject.org
+++ b/inventory/host_vars/virthost16.phx2.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
+# This virthost only has stg instances, so it doesn't freeze
+freezes: false
diff --git a/inventory/host_vars/virthost17.phx2.fedoraproject.org b/inventory/host_vars/virthost17.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/virthost17.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/host_vars/virthost18.phx2.fedoraproject.org b/inventory/host_vars/virthost18.phx2.fedoraproject.org
deleted file mode 100644
index d34cfdb7b6..0000000000
--- a/inventory/host_vars/virthost18.phx2.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nrpe_procs_warn: 900
-nrpe_procs_crit: 1000
diff --git a/inventory/inventory b/inventory/inventory
index d917199b90..d49d875622 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -587,10 +587,6 @@ virthost15.phx2.fedoraproject.org
 virthost16.phx2.fedoraproject.org
 virthost17.phx2.fedoraproject.org
 virthost18.phx2.fedoraproject.org
-virthost-comm01.qa.fedoraproject.org
-virthost-comm02.qa.fedoraproject.org
-virthost-comm03.qa.fedoraproject.org
-virthost-comm04.qa.fedoraproject.org
 qa04.qa.fedoraproject.org
 qa05.qa.fedoraproject.org
 qa06.qa.fedoraproject.org
@@ -602,6 +598,12 @@ qa12.qa.fedoraproject.org
 qa13.qa.fedoraproject.org
 qa14.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
+
 [wiki-stg]
 wiki01.stg.phx2.fedoraproject.org
 
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index 45c5157e57..306d77b477 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -3,7 +3,7 @@
 # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars
 
 - name: make virthost server system
-  hosts: virthost15.phx2.fedoraproject.org:bvirthost07.phx2.fedoraproject.org:buildvmhost-10.phx2.fedoraproject.org:buildvmhost-11.phx2.fedoraproject.org:buildvmhost-12.phx2.fedoraproject.org:virthost01.phx2.fedoraproject.org:virthost03.phx2.fedoraproject.org:ibiblio01.fedoraproject.org:ibiblio04.fedoraproject.org:bvirthost06.phx2.fedoraproject.org:bvirthost08.phx2.fedoraproject.org:bvirthost09.phx2.fedoraproject.org:bvirthost10.phx2.fedoraproject.org:bvirthost11.phx2.fedoraproject.org:virthost16.phx2.fedoraproject.org:virthost17.phx2.fedoraproject.org:virthost18.phx2.fedoraproject.org:serverbeach07.fedoraproject.org:qa07.qa.fedoraproject.org:qa09.qa.fedoraproject.org:qa10.qa.fedoraproject.org:qa11.qa.fedoraproject.org:qa12.qa.fedoraproject.org:qa13.qa.fedoraproject.org:qa14.qa.fedoraproject.org:coloamer01.fedoraproject.org:qa04.qa.fedoraproject.org:qa05.qa.fedoraproject.org:osuosl03.fedoraproject.org:qa06.qa.fedoraproject.org:virthost-comm03.qa.fedoraproject.org:host1plus01.fedoraproject.org:virthost10.phx2.fedoraproject.org:virthost12.phx2.fedoraproject.org:virthost06.phx2.fedoraproject.org:virthost07.phx2.fedoraproject.org:virthost08.phx2.fedoraproject.org:virthost09.phx2.fedoraproject.org:virthost14.phx2.fedoraproject.org:virthost05.phx2.fedoraproject.org:dedicatedsolutions01.fedoraproject.org:tummy01.fedoraproject.org:osuosl01.fedoraproject.org:virthost-comm04.qa.fedoraproject.org:virthost11.phx2.fedoraproject.org:virthost02.phx2.fedoraproject.org
+  hosts: virthost:bvirthost:buildvmhost:virthost-comm03.qa.fedoraproject.org:virthost-comm04.qa.fedoraproject.org:ibiblio01.fedoraproject.org:ibiblio04.fedoraproject.org:serverbeach07.fedoraproject.org:coloamer01.fedoraproject.org:osuosl03.fedoraproject.org:host1plus01.fedoraproject.org:dedicatedsolutions01.fedoraproject.org:tummy01.fedoraproject.org:osuosl01.fedoraproject.org
   user: root
   gather_facts: True