diff --git a/inventory/inventory b/inventory/inventory
index ebb3fbb325..23f8b55aa9 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -670,58 +670,50 @@ wiki01.phx2.fedoraproject.org
 wiki02.phx2.fedoraproject.org
 
 # assorted categories of fedmsg services, for convenience
-[fedmsg-hubs]
-badges-backend01.phx2.fedoraproject.org
-busgateway01.phx2.fedoraproject.org
-fedimg01.phx2.fedoraproject.org
-hotness01.phx2.fedoraproject.org
-notifs-backend01.phx2.fedoraproject.org
-pkgs02.phx2.fedoraproject.org
-summershum01.phx2.fedoraproject.org
+[fedmsg-hubs:children]
+badges-backend
+busgateway
+fedimg
+hotness
+notifs-backend
+pkgs
+summershum
 
-[fedmsg-hubs-stg]
-badges-backend01.stg.phx2.fedoraproject.org
-busgateway01.stg.phx2.fedoraproject.org
-fedimg01.stg.phx2.fedoraproject.org
-hotness01.stg.phx2.fedoraproject.org
-notifs-backend01.stg.phx2.fedoraproject.org
-pkgs01.stg.phx2.fedoraproject.org
-summershum01.stg.phx2.fedoraproject.org
+[fedmsg-hubs-stg:children]
+badges-backend-stg
+busgateway-stg
+fedimg-stg
+hotness-stg
+notifs-backend-stg
+pkgs-stg
+summershum-stg
 
-[fedmsg-ircs]
-value01.phx2.fedoraproject.org
+[fedmsg-ircs:children]
+value
 
-[fedmsg-ircs-stg]
-value01.stg.phx2.fedoraproject.org
+[fedmsg-ircs-stg:children]
+value-stg
 
-[fedmsg-relays]
-busgateway01.phx2.fedoraproject.org
-anitya-frontend01.fedoraproject.org
+[fedmsg-relays:children]
+busgateway
+anitya-frontend
 
-[fedmsg-relays-stg]
-busgateway01.stg.phx2.fedoraproject.org
+[fedmsg-relays-stg:children]
+busgateway-stg
 
-[fedmsg-gateways]
-busgateway01.phx2.fedoraproject.org
-proxy01.phx2.fedoraproject.org
-proxy02.fedoraproject.org
-proxy03.fedoraproject.org
-proxy04.fedoraproject.org
-proxy06.fedoraproject.org
-proxy07.fedoraproject.org
-proxy08.fedoraproject.org
-proxy09.fedoraproject.org
-proxy10.phx2.fedoraproject.org
+[fedmsg-gateways:children]
+busgateway
+proxies
 
-[fedmsg-gateways-stg]
-busgateway01.stg.phx2.fedoraproject.org
-proxy01.stg.phx2.fedoraproject.org
+[fedmsg-gateways-stg:children]
+busgateway-stg
+proxies-stg
 
-[moksha-hubs]
-bugzilla2fedmsg01.phx2.fedoraproject.org
+[moksha-hubs:children]
+bugzilla2fedmsg
 
-[moksha-hubs-stg]
-bugzilla2fedmsg01.stg.phx2.fedoraproject.org
+[moksha-hubs-stg:children]
+bugzilla2fedmsg-stg
 
 [fedmsg-services:children]
 fedmsg-hubs