diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 83551dfa2f..5268889997 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -142,7 +142,6 @@ exclude_phx2_hostgroups:
   - openqa_iad
   - download_tier1
   - datacenter_iad2
-  - buildvm_ppc64le_iad2
   - sign_vault
   - bugzilla2fedmsg
   - github2fedmsg
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 3c91668bb8..450d3d86d4 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -3,10 +3,10 @@
 # NOTE: make sure there is room/space for this builder on the buildvmhost
 # NOTE: most of these vars_path come from group_vars/buildvm or from hostvars
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64le:buildvm_ppc64le_iad2:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x_stg:buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org:buildvm-s390x-17.s390.fedoraproject.org:buildvm-s390x-18.s390.fedoraproject.org:buildvm-s390x-19.s390.fedoraproject.org:buildvm-s390x-20.s390.fedoraproject.org:buildvm-s390x-21.s390.fedoraproject.org:buildvm-s390x-22.s390.fedoraproject.org:buildvm-s390x-23.s390.fedoraproject.org:buildvm-s390x-24.s390.fedoraproject.org"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x_stg:buildvm-s390x-15.s390.fedoraproject.org:buildvm-s390x-16.s390.fedoraproject.org:buildvm-s390x-17.s390.fedoraproject.org:buildvm-s390x-18.s390.fedoraproject.org:buildvm-s390x-19.s390.fedoraproject.org:buildvm-s390x-20.s390.fedoraproject.org:buildvm-s390x-21.s390.fedoraproject.org:buildvm-s390x-22.s390.fedoraproject.org:buildvm-s390x-23.s390.fedoraproject.org:buildvm-s390x-24.s390.fedoraproject.org"
 
 - name: make koji builder(s)
-  hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64le:buildvm_ppc64le_iad2:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x:buildvm_s390x_stg
+  hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x:buildvm_s390x_stg
   user: root
   gather_facts: True
 
diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml
index 74057b13fa..2d0d3d947c 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-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.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"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.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-qa01.qa.fedoraproject.org:db-fas01.stg.iad2.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
+  hosts: db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.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