diff --git a/inventory/hardware b/inventory/hardware
index 6d02c02401..745279ef98 100644
--- a/inventory/hardware
+++ b/inventory/hardware
@@ -5,6 +5,7 @@ download03.phx2.fedoraproject.org
 download04.phx2.fedoraproject.org
 download05.phx2.fedoraproject.org
 virthost01.stg.phx2.fedoraproject.org
+virthost01.phx2.fedoraproject.org
 virthost02.phx2.fedoraproject.org
 virthost03.phx2.fedoraproject.org
 virthost04.phx2.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index 06a32deceb..042a0e5ac9 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -716,14 +716,15 @@ hubs01.stg.phx2.fedoraproject.org
 # All staging hosts should be in this group too.
 #
 [staging]
-autocloud-web01.stg.phx2.fedoraproject.org
-autocloud-web02.stg.phx2.fedoraproject.org
 autocloud-backend01.stg.phx2.fedoraproject.org
 autocloud-backend02.stg.phx2.fedoraproject.org
+autocloud-web01.stg.phx2.fedoraproject.org
+autocloud-web02.stg.phx2.fedoraproject.org
 autosign01.stg.phx2.fedoraproject.org
 badges-backend01.stg.phx2.fedoraproject.org
 badges-web01.stg.phx2.fedoraproject.org
 basset01.stg.phx2.fedoraproject.org
+beaker-stg01.qa.fedoraproject.org
 blockerbugs01.stg.phx2.fedoraproject.org
 bodhi-backend01.stg.phx2.fedoraproject.org
 bugyou01.stg.phx2.fedoraproject.org
@@ -733,10 +734,10 @@ buildvm-02.stg.phx2.fedoraproject.org
 buildvm-03.stg.phx2.fedoraproject.org
 buildvm-04.stg.phx2.fedoraproject.org
 buildvm-05.stg.phx2.fedoraproject.org
-buildvm-ppc64-01.stg.ppc.fedoraproject.org
-buildvm-ppc64le-01.stg.ppc.fedoraproject.org
 buildvm-aarch64-01.stg.arm.fedoraproject.org
 buildvm-armv7-01.stg.arm.fedoraproject.org
+buildvm-ppc64-01.stg.ppc.fedoraproject.org
+buildvm-ppc64le-01.stg.ppc.fedoraproject.org
 buildvm-s390x-01.stg.s390.fedoraproject.org
 busgateway01.stg.phx2.fedoraproject.org
 composer.stg.phx2.fedoraproject.org
@@ -745,38 +746,56 @@ copr-dist-git-dev.fedorainfracloud.org
 copr-fe-dev.cloud.fedoraproject.org
 copr-keygen-dev.cloud.fedoraproject.org
 datagrepper01.stg.phx2.fedoraproject.org
-db01.stg.phx2.fedoraproject.org
-db03.stg.phx2.fedoraproject.org
 db-fas01.stg.phx2.fedoraproject.org
 db-koji01.stg.phx2.fedoraproject.org
+db01.stg.phx2.fedoraproject.org
+db03.stg.phx2.fedoraproject.org
+docker-candidate-registry01.stg.phx2.fedoraproject.org
+docker-registry01.stg.phx2.fedoraproject.org
+docker-registry02.stg.phx2.fedoraproject.org
 elections01.stg.phx2.fedoraproject.org
 fas01.stg.phx2.fedoraproject.org
 fedimg01.stg.phx2.fedoraproject.org
 fedocal01.stg.phx2.fedoraproject.org
-freshmaker-frontend01.stg.phx2.fedoraproject.org
 freshmaker-backend01.stg.phx2.fedoraproject.org
+freshmaker-frontend01.stg.phx2.fedoraproject.org
 github2fedmsg01.stg.phx2.fedoraproject.org
 hotness01.stg.phx2.fedoraproject.org
 hubs01.stg.phx2.fedoraproject.org
+ipa01.stg.phx2.fedoraproject.org
+ipsilon01.stg.phx2.fedoraproject.org
 kerneltest01.stg.phx2.fedoraproject.org
 koji01.stg.phx2.fedoraproject.org
 koschei-backend01.stg.phx2.fedoraproject.org
 koschei-web01.stg.phx2.fedoraproject.org
+loopabull01.stg.phx2.fedoraproject.org
 mailman01.stg.phx2.fedoraproject.org
+mbs-backend01.stg.phx2.fedoraproject.org
 mbs-frontend01.stg.phx2.fedoraproject.org
 mbs-frontend02.stg.phx2.fedoraproject.org
-mbs-backend01.stg.phx2.fedoraproject.org
 mdapi01.stg.phx2.fedoraproject.org
-ipa01.stg.phx2.fedoraproject.org
-ipsilon01.stg.phx2.fedoraproject.org
-loopabull01.stg.phx2.fedoraproject.org
 memcached01.stg.phx2.fedoraproject.org
+mm-backend01.stg.phx2.fedoraproject.org
+mm-crawler01.stg.phx2.fedoraproject.org
+mm-frontend01.stg.phx2.fedoraproject.org
 modernpaste01.stg.phx2.fedoraproject.org
 notifs-backend01.stg.phx2.fedoraproject.org
 notifs-web01.stg.phx2.fedoraproject.org
 notifs-web02.stg.phx2.fedoraproject.org
 nuancier01.stg.phx2.fedoraproject.org
 nuancier02.stg.phx2.fedoraproject.org
+odcs-backend01.stg.phx2.fedoraproject.org
+odcs-frontend01.stg.phx2.fedoraproject.org
+os-control01.stg.phx2.fedoraproject.org
+os-master01.stg.phx2.fedoraproject.org
+os-master02.stg.phx2.fedoraproject.org
+os-master03.stg.phx2.fedoraproject.org
+os-node01.stg.phx2.fedoraproject.org
+os-node02.stg.phx2.fedoraproject.org
+osbs-control01.stg.phx2.fedoraproject.org
+osbs-master01.stg.phx2.fedoraproject.org
+osbs-node01.stg.phx2.fedoraproject.org
+osbs-node02.stg.phx2.fedoraproject.org
 packages03.stg.phx2.fedoraproject.org
 pdc-backend01.stg.phx2.fedoraproject.org
 pdc-backend02.stg.phx2.fedoraproject.org
@@ -791,35 +810,16 @@ qa-stg01.qa.fedoraproject.org ansible_port=222
 resultsdb-stg01.qa.fedoraproject.org
 retrace02.qa.fedoraproject.org
 sign-bridge01.stg.phx2.fedoraproject.org
+statscache-backend01.stg.phx2.fedoraproject.org
 statscache-web01.stg.phx2.fedoraproject.org
 statscache-web02.stg.phx2.fedoraproject.org
-statscache-backend01.stg.phx2.fedoraproject.org
 sundries01.stg.phx2.fedoraproject.org
 tagger01.stg.phx2.fedoraproject.org
 taskotron-stg01.qa.fedoraproject.org
 value01.stg.phx2.fedoraproject.org
 virthost01.stg.phx2.fedoraproject.org
 wiki01.stg.phx2.fedoraproject.org
-mm-frontend01.stg.phx2.fedoraproject.org
-mm-backend01.stg.phx2.fedoraproject.org
-mm-crawler01.stg.phx2.fedoraproject.org
-beaker-stg01.qa.fedoraproject.org
 zanata2fedmsg01.stg.phx2.fedoraproject.org
-odcs-frontend01.stg.phx2.fedoraproject.org
-odcs-backend01.stg.phx2.fedoraproject.org
-osbs-control01.stg.phx2.fedoraproject.org
-osbs-master01.stg.phx2.fedoraproject.org
-osbs-node01.stg.phx2.fedoraproject.org
-osbs-node02.stg.phx2.fedoraproject.org
-docker-registry01.stg.phx2.fedoraproject.org
-docker-registry02.stg.phx2.fedoraproject.org
-docker-candidate-registry01.stg.phx2.fedoraproject.org
-os-control01.stg.phx2.fedoraproject.org
-os-master01.stg.phx2.fedoraproject.org
-os-master02.stg.phx2.fedoraproject.org
-os-master03.stg.phx2.fedoraproject.org
-os-node01.stg.phx2.fedoraproject.org
-os-node02.stg.phx2.fedoraproject.org
 # We know it's marked as a dev node but it simplifies things
 simple-koji-ci-dev.fedorainfracloud.org
 
@@ -917,6 +917,7 @@ value01.stg.phx2.fedoraproject.org
 
 [virthost]
 virthost01.stg.phx2.fedoraproject.org
+virthost01.phx2.fedoraproject.org
 virthost02.phx2.fedoraproject.org
 virthost03.phx2.fedoraproject.org
 virthost04.phx2.fedoraproject.org