diff --git a/inventory/inventory b/inventory/inventory
index f26c546f8b..b997a8f225 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -25,7 +25,7 @@ buildvm-18.phx2.fedoraproject.org
 buildvm-19.phx2.fedoraproject.org
 buildvm-20.phx2.fedoraproject.org
 buildvm-21.phx2.fedoraproject.org
-buildvm-22.phx2.fedoraproject.org
+#buildvm-22.phx2.fedoraproject.org
 buildvm-23.phx2.fedoraproject.org
 buildvm-24.phx2.fedoraproject.org
 buildvm-25.phx2.fedoraproject.org
@@ -60,3 +60,235 @@ buildhw-02.phx2.fedoraproject.org
 [releng]
 releng01.phx2.fedoraproject.org
 
+[app]
+app01.phx2.fedoraproject.org
+app02.phx2.fedoraproject.org
+app03.phx2.fedoraproject.org
+app04.phx2.fedoraproject.org
+app05.fedoraproject.org
+app06.fedoraproject.org
+app07.phx2.fedoraproject.org
+app08.fedoraproject.org
+
+[app-stg]
+app01.stg.phx2.fedoraproject.org
+app02.stg.phx2.fedoraproject.org
+
+[ask]
+ask01.phx2.fedoraproject.org
+ask01.stg.phx2.fedoraproject.org
+
+[backup]
+backup02.fedoraproject.org
+backup03.phx2.fedoraproject.org
+
+[bapp]
+bapp02.phx2.fedoraproject.org
+
+[bastion]
+bastion01.phx2.fedoraproject.org
+bastion02.phx2.fedoraproject.org
+bastion-comm01.qa.fedoraproject.org
+
+[bkernel]
+bkernel01.phx2.fedoraproject.org
+bkernel02.phx2.fedoraproject.org
+
+
+[colo-virt]
+bodhost01.fedoraproject.org
+coloamer01.fedoraproject.org
+ibiblio01.fedoraproject.org
+ibiblio02.fedoraproject.org
+ibiblio03.fedoraproject.org
+internetx01.fedoraproject.org
+osuosl01.fedoraproject.org
+osuosl02.fedoraproject.org
+serverbeach06.fedoraproject.org
+serverbeach07.fedoraproject.org
+serverbeach08.fedoraproject.org
+serverbeach09.fedoraproject.org
+serverbeach10.fedoraproject.org
+telia01.fedoraproject.org
+tummy01.fedoraproject.org
+
+[fedmsg]
+busgateway01.phx2.fedoraproject.org
+busgateway01.stg.phx2.fedoraproject.org
+
+[build-infra]
+bvirthost01.phx2.fedoraproject.org
+bvirthost02.phx2.fedoraproject.org
+bvirthost03.phx2.fedoraproject.org
+bvirthost04.phx2.fedoraproject.org
+bvirthost05.phx2.fedoraproject.org
+bnfs01.phx2.fedoraproject.org
+
+[collab]
+collab01.fedoraproject.org
+collab02.fedoraproject.org
+collab03.fedoraproject.org
+
+[releng]
+compose-x86-01.phx2.fedoraproject.org
+releng01.stg.phx2.fedoraproject.org
+releng03.phx2.fedoraproject.org
+releng04.phx2.fedoraproject.org
+relepel01.phx2.fedoraproject.org
+sign-bridge02.phx2.fedoraproject.org
+sign-vault02.phx2.fedoraproject.org
+
+[darkserver]
+darkserver01.dev.fedoraproject.org
+darkserver01.phx2.fedoraproject.org
+
+[dbserver]
+db01.phx2.fedoraproject.org
+db02.stg.phx2.fedoraproject.org
+db04.phx2.fedoraproject.org
+db05.phx2.fedoraproject.org
+db-fas01.phx2.fedoraproject.org
+db-fas01.stg.phx2.fedoraproject.org
+
+
+
+
+[download]
+download01.phx2.fedoraproject.org
+download02.phx2.fedoraproject.org
+download03.phx2.fedoraproject.org
+download04.phx2.fedoraproject.org
+download05.phx2.fedoraproject.org
+download-ib01.fedoraproject.org
+download-rdu01.fedoraproject.org
+download-rdu02.fedoraproject.org
+download-rdu03.fedoraproject.org
+
+[fas]
+fakefas01.fedoraproject.org
+fas01.dev.fedoraproject.org
+fas01.phx2.fedoraproject.org
+fas01.stg.phx2.fedoraproject.org
+fas02.phx2.fedoraproject.org
+fas03.phx2.fedoraproject.org
+
+[hosted]
+hosted01.fedoraproject.org
+hosted02.fedoraproject.org
+hosted-lists01.fedoraproject.org
+
+[insight]
+insight01.dev.fedoraproject.org
+insight01.phx2.fedoraproject.org
+insight01.stg.phx2.fedoraproject.org
+insight02.dev.fedoraproject.org
+
+[keys]
+keys01.fedoraproject.org
+
+[koji]
+koji01.stg.phx2.fedoraproject.org
+koji03.phx2.fedoraproject.org
+koji04.phx2.fedoraproject.org
+kojipkgs02.phx2.fedoraproject.org
+
+[infracore]
+lockbox01.phx2.fedoraproject.org
+log02.phx2.fedoraproject.org
+dhcp01.phx2.fedoraproject.org
+noc01.phx2.fedoraproject.org
+noc02.fedoraproject.org
+
+[memcached]
+memcached03.phx2.fedoraproject.org
+memcached04.phx2.fedoraproject.org
+
+[other]
+mm3test.fedoraproject.org
+people03.fedoraproject.org
+survey01.dev.fedoraproject.org
+secondary01.phx2.fedoraproject.org
+torrent02.fedoraproject.org
+
+[nfs]
+nfs01.phx2.fedoraproject.org
+
+[dns]
+ns02.fedoraproject.org
+ns03.phx2.fedoraproject.org
+ns04.phx2.fedoraproject.org
+ns05.fedoraproject.org
+ns-sb01.fedoraproject.org
+
+[packages]
+packages01.dev.fedoraproject.org
+packages01.phx2.fedoraproject.org
+packages01.stg.phx2.fedoraproject.org
+packages02.phx2.fedoraproject.org
+
+[paste]
+paste01.dev.fedoraproject.org
+paste01.stg.phx2.fedoraproject.org
+
+
+[pkgdb]
+pkgdb01.dev.fedoraproject.org
+pkgs01.phx2.fedoraproject.org
+pkgs01.stg.phx2.fedoraproject.org
+
+[buildppc]
+ppc11.phx2.fedoraproject.org
+ppc12.phx2.fedoraproject.org
+
+[proxies]
+proxy01.phx2.fedoraproject.org
+proxy01.stg.phx2.fedoraproject.org
+proxy02.fedoraproject.org
+proxy03.fedoraproject.org
+proxy04.fedoraproject.org
+proxy05.fedoraproject.org
+proxy06.fedoraproject.org
+proxy07.fedoraproject.org
+proxy08.fedoraproject.org
+
+[publictest]
+publictest01.fedoraproject.org
+publictest02.fedoraproject.org
+publictest04.fedoraproject.org
+
+[qa]
+qa01.dev.fedoraproject.org
+
+
+[smtp]
+smtp-mm01.fedoraproject.org
+smtp-mm02.fedoraproject.org
+smtp-mm03.fedoraproject.org
+
+
+[unbound-dns]
+unbound-ib01.fedoraproject.org
+unbound-telia01.fedoraproject.org
+unbound-tummy01.fedoraproject.org
+
+[value]
+value01.stg.phx2.fedoraproject.org
+value03.phx2.fedoraproject.org
+value04.phx2.fedoraproject.org
+
+[virthost]
+virthost01.phx2.fedoraproject.org
+virthost02.phx2.fedoraproject.org
+virthost03.phx2.fedoraproject.org
+virthost04.phx2.fedoraproject.org
+virthost05.phx2.fedoraproject.org
+virthost06.phx2.fedoraproject.org
+virthost07.phx2.fedoraproject.org
+virthost08.phx2.fedoraproject.org
+virthost09.phx2.fedoraproject.org
+virthost10.phx2.fedoraproject.org
+virthost11.phx2.fedoraproject.org
+virthost12.phx2.fedoraproject.org
+virthost13.phx2.fedoraproject.org
+virthost-comm01.qa.fedoraproject.org
+