diff --git a/inventory/group_vars/iad2_guests b/inventory/group_vars/iad2_production
similarity index 100%
rename from inventory/group_vars/iad2_guests
rename to inventory/group_vars/iad2_production
diff --git a/inventory/inventory b/inventory/inventory
index 2ae00e91ac..f83b3a1d97 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1227,3 +1227,87 @@ storinator01.rdu-cc.fedoraproject.org
 [no_linux_system_roles:children]
 cloud_aws
 ibiblio_virt
+
+[iad2:children]
+iad2_production
+iad2_staging
+
+[iad2_production:children]
+backup
+badges
+bastion
+batcave
+bodhi_backend
+builders
+busgateway
+bvirthost
+certgetter
+dbserver
+debuginfod
+dns
+download_iad2
+fedimg
+github2fedmsg
+ipa
+ipsilon
+kerneltest
+koji
+kojipkgs
+logging
+mailman
+mbs
+memcached
+mm
+nagios
+notifs
+nuancier
+oci_registry
+odcs
+openqa
+openqa_lab
+openqa_lab_workers
+openqa_workers
+pdc_web
+pkgs
+proxies
+qahardware
+rabbitmq
+releng_compose
+resultsdb_prod
+secondary
+sundries
+tang
+value
+virthost
+wiki
+
+[iad2_staging:children]
+staging
+badges_stg
+bastion_stg
+bodhi_backend_stg
+builders_stg
+busgateway_stg
+dbserver_stg
+debuginfod_stg
+fedimg_stg
+github2fedmsg_stg
+ipa_stg
+ipsilon_stg
+koji_stg
+mbs_stg
+memcached_stg
+mm_stg
+nuancier_stg
+oci_registry_stg
+odcs_stg
+pdc_web_stg
+pkgs_stg
+proxies_stg
+rabbitmq_stg
+releng_compose_stg
+resultsdb_stg
+sundries_stg
+value_stg
+wiki_stg
+zabbix_stg