diff --git a/inventory/inventory b/inventory/inventory
index 553e886c6a..1f82d78f89 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -52,7 +52,6 @@ badges-web02.phx2.fedoraproject.org
 # badges-web01.stg.phx2.fedoraproject.org
 
 [basset]
-basset01.phx2.fedoraproject.org
 
 [basset_stg]
 # basset01.stg.phx2.fedoraproject.org
@@ -115,9 +114,7 @@ virthost-cc-rdu03.fedoraproject.org
 #cloudvmhost-aarch64-01.fedorainfracloud.org
 
 [datagrepper]
-datagrepper01.phx2.fedoraproject.org
 datagrepper01.iad2.fedoraproject.org
-datagrepper02.phx2.fedoraproject.org
 
 [datagrepper_stg]
 # datagrepper01.stg.phx2.fedoraproject.org
@@ -163,8 +160,8 @@ mbs-frontend02.phx2.fedoraproject.org
 # mbs-frontend02.stg.phx2.fedoraproject.org
 
 [mbs_backend]
-mbs-backend01.phx2.fedoraproject.org
 mbs-backend01.iad2.fedoraproject.org
+mbs-backend01.phx2.fedoraproject.org
 
 [mbs_backend_stg]
 # mbs-backend01.stg.phx2.fedoraproject.org
@@ -207,12 +204,10 @@ autosign01.iad2.fedoraproject.org
 [dbserver]
 db01.phx2.fedoraproject.org
 db01.iad2.fedoraproject.org
-db03.phx2.fedoraproject.org
 db03.iad2.fedoraproject.org
 db-fas01.phx2.fedoraproject.org
 db-fas01.iad2.fedoraproject.org
 db-datanommer01.iad2.fedoraproject.org
-db-datanommer02.phx2.fedoraproject.org
 db-koji01.iad2.fedoraproject.org
 db-qa01.qa.fedoraproject.org
 db-qa02.qa.fedoraproject.org
@@ -323,8 +318,6 @@ batcave01.iad2.fedoraproject.org
 batcave13.rdu2.fedoraproject.org
 
 [ipa]
-ipa01.phx2.fedoraproject.org
-ipa02.phx2.fedoraproject.org
 ipa01.iad2.fedoraproject.org
 ipa02.iad2.fedoraproject.org
 
@@ -360,9 +353,7 @@ notifs-web02.iad2.fedoraproject.org
 # nuancier02.stg.phx2.fedoraproject.org
 
 [memcached]
-memcached01.phx2.fedoraproject.org
 memcached01.iad2.fedoraproject.org
-memcached02.phx2.fedoraproject.org
 
 [memcached_stg]
 # memcached01.stg.phx2.fedoraproject.org
@@ -437,7 +428,6 @@ tang02.iad2.fedoraproject.org
 torrent02.fedoraproject.org
 
 [secondary]
-secondary01.phx2.fedoraproject.org
 secondary01.iad2.fedoraproject.org
 
 [dns]
@@ -455,7 +445,6 @@ ns04.phx2.fedoraproject.org
 ns05.fedoraproject.org
 
 [odcs_frontend]
-odcs-frontend01.phx2.fedoraproject.org
 odcs-frontend01.iad2.fedoraproject.org
 
 [odcs_frontend_stg]
@@ -466,11 +455,9 @@ odcs_backend_general
 odcs_backend_releng
 
 [odcs_backend_general]
-odcs-backend01.phx2.fedoraproject.org
 odcs-backend01.iad2.fedoraproject.org
 
 [odcs_backend_releng]
-odcs-backend-releng01.phx2.fedoraproject.org
 
 [odcs_backend_stg]
 # odcs-backend01.stg.phx2.fedoraproject.org
@@ -514,8 +501,6 @@ openqa-a64-worker01.iad2.fedoraproject.org
 openqa-x86-worker01.iad2.fedoraproject.org
 
 [packages]
-packages03.phx2.fedoraproject.org
-packages04.phx2.fedoraproject.org
 
 [packages_stg]
 # packages03.stg.phx2.fedoraproject.org
@@ -730,8 +715,6 @@ tang01.phx2.fedoraproject.org
 tang02.phx2.fedoraproject.org
 
 [sundries]
-sundries01.phx2.fedoraproject.org
-sundries02.phx2.fedoraproject.org
 sundries01.iad2.fedoraproject.org
 
 [sundries_stg]
@@ -802,7 +785,6 @@ wiki01.iad2.fedoraproject.org
 # zanata2fedmsg01.stg.phx2.fedoraproject.org
 
 [zanata2fedmsg]
-zanata2fedmsg01.phx2.fedoraproject.org
 
 # This is a convenience group listing the hosts that live on the QA network that
 # are allowed to send inbound fedmsg messages to our production fedmsg bus.
@@ -891,17 +873,12 @@ mailman_stg
 
 
 [pdc_web]
-pdc-web01.phx2.fedoraproject.org
 pdc-web01.iad2.fedoraproject.org
-pdc-web02.phx2.fedoraproject.org
 
 [pdc_web_stg]
 # pdc-web01.stg.phx2.fedoraproject.org
 
 [pdc_backend]
-pdc-backend01.phx2.fedoraproject.org
-pdc-backend02.phx2.fedoraproject.org
-pdc-backend03.phx2.fedoraproject.org
 pdc-backend01.iad2.fedoraproject.org
 pdc-backend02.iad2.fedoraproject.org
 pdc-backend03.iad2.fedoraproject.org
@@ -1022,7 +999,6 @@ pagure01.fedoraproject.org
 pagure-stg01.fedoraproject.org
 
 [gnome_backups]
-gnome-backups01.phx2.fedoraproject.org
 
 [qa_isolated]
 # openQA boxes start - note old openQA aarch64 workers intentionally
@@ -1196,7 +1172,7 @@ badges-backend01.phx2.fedoraproject.org
 bodhi-backend01.phx2.fedoraproject.org
 mailman01.phx2.fedoraproject.org
 people02.fedoraproject.org
-db-datanommer02.phx2.fedoraproject.org
+#db-datanommer02.phx2.fedoraproject.org
 #nuancier01.phx2.fedoraproject.org
 #fedocal02.phx2.fedoraproject.org
 pagure01.fedoraproject.org
@@ -1459,7 +1435,6 @@ backup01.phx2.fedoraproject.org
 badges-backend01.phx2.fedoraproject.org
 badges-web01.phx2.fedoraproject.org
 badges-web02.phx2.fedoraproject.org
-basset01.phx2.fedoraproject.org
 bastion-comm01.qa.fedoraproject.org
 bastion01.phx2.fedoraproject.org
 bastion02.phx2.fedoraproject.org
@@ -1593,18 +1568,13 @@ bvirthost15.phx2.fedoraproject.org
 data-analysis01.phx2.fedoraproject.org
 datagrepper01.phx2.fedoraproject.org
 datagrepper02.phx2.fedoraproject.org
-db-datanommer02.phx2.fedoraproject.org
 db-fas01.phx2.fedoraproject.org
 db-qa01.qa.fedoraproject.org
 db-qa02.qa.fedoraproject.org
 db-qa03.qa.fedoraproject.org
-db01.phx2.fedoraproject.org
-db03.phx2.fedoraproject.org
 fas01.phx2.fedoraproject.org
 fedimg01.phx2.fedoraproject.org
 gnome-backups01.phx2.fedoraproject.org
-ipa01.phx2.fedoraproject.org
-ipa02.phx2.fedoraproject.org
 kernel02.qa.fedoraproject.org
 kernel03.qa.fedoraproject.org
 kerneltest01.phx2.fedoraproject.org
@@ -1615,14 +1585,9 @@ mailman02.phx2.fedoraproject.org
 mbs-backend01.phx2.fedoraproject.org
 mbs-frontend01.phx2.fedoraproject.org
 mbs-frontend02.phx2.fedoraproject.org
-memcached01.phx2.fedoraproject.org
-memcached02.phx2.fedoraproject.org
 noc01.phx2.fedoraproject.org
 ns03.phx2.fedoraproject.org
 ns04.phx2.fedoraproject.org
-odcs-backend-releng01.phx2.fedoraproject.org
-odcs-backend01.phx2.fedoraproject.org
-odcs-frontend01.phx2.fedoraproject.org
 openqa-aarch64-01.qa.fedoraproject.org
 openqa-aarch64-03.qa.fedoraproject.org
 openqa-ppc64le-01.qa.fedoraproject.org
@@ -1643,13 +1608,6 @@ osbs-control01.phx2.fedoraproject.org
 osbs-master01.phx2.fedoraproject.org
 osbs-node01.phx2.fedoraproject.org
 osbs-node02.phx2.fedoraproject.org
-packages03.phx2.fedoraproject.org
-packages04.phx2.fedoraproject.org
-pdc-backend01.phx2.fedoraproject.org
-pdc-backend02.phx2.fedoraproject.org
-pdc-backend03.phx2.fedoraproject.org
-pdc-web01.phx2.fedoraproject.org
-pdc-web02.phx2.fedoraproject.org
 ppc8-01.ppc.fedoraproject.org
 ppc8-02.ppc.fedoraproject.org
 ppc8-03.ppc.fedoraproject.org
@@ -1688,4 +1646,4 @@ virthost18.phx2.fedoraproject.org
 virthost19.phx2.fedoraproject.org
 virthost21.phx2.fedoraproject.org
 virthost22.phx2.fedoraproject.org
-zanata2fedmsg01.phx2.fedoraproject.org
+db01.phx2.fedoraproject.org
diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml
index d2087d3adc..0a9492da5b 100644
--- a/playbooks/groups/mariadb-server.yml
+++ b/playbooks/groups/mariadb-server.yml
@@ -2,12 +2,12 @@
 # NOTE: should be used with --limit most of the time
 # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org:db03.iad2.fedoraproject.org"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.stg.iad2.fedoraproject.org:db03.iad2.fedoraproject.org"
 
 # Once the instance exists, configure it.
 
 - name: configure mariadb server system
-  hosts: db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org:db03.iad2.fedoraproject.org
+  hosts: db03.stg.iad2.fedoraproject.org:db03.iad2.fedoraproject.org
   user: root
   gather_facts: True
 
diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml
index 13f93c2c05..6dda15c689 100644
--- a/playbooks/groups/postgresql-server.yml
+++ b/playbooks/groups/postgresql-server.yml
@@ -2,12 +2,12 @@
 # NOTE: should be used with --limit most of the time
 # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org"
 
 # Once the instance exists, configure it.
 
 - name: configure postgresql server system
-  hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org
+  hosts: db-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-qa03.qa.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org
   user: root
   gather_facts: True