diff --git a/inventory/inventory b/inventory/inventory
index 1700f333cb..81b6e7f7dd 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -20,7 +20,7 @@ compose-iot01.iad2.fedoraproject.org
 # composer.stg.iad2.fedoraproject.org
 
 [retrace]
-retrace01.qa.fedoraproject.org
+#retrace01.qa.fedoraproject.org
 #retrace03.fedorainfracloud.org
 
 [retrace_stg_aws]
@@ -255,8 +255,8 @@ download_iad2
 kerneltest01.iad2.fedoraproject.org
 
 [kernel_qa]
-kernel02.qa.fedoraproject.org
-kernel03.qa.fedoraproject.org
+#kernel02.qa.fedoraproject.org
+#kernel03.qa.fedoraproject.org
 
 [koji]
 koji01.iad2.fedoraproject.org
@@ -377,8 +377,6 @@ mm_crawler_stg
 people02.fedoraproject.org
 
 [qahardware]
-qa05.qa.fedoraproject.org
-qa14.qa.fedoraproject.org
 
 [tang]
 tang01.iad2.fedoraproject.org
@@ -688,7 +686,6 @@ value01.iad2.fedoraproject.org
 # virthost03.stg.iad2.fedoraproject.org
 # virthost04.stg.iad2.fedoraproject.org
 # virthost05.stg.iad2.fedoraproject.org
-#qa09.qa.fedoraproject.org
 vmhost-x86-01.iad2.fedoraproject.org
 vmhost-x86-02.iad2.fedoraproject.org
 vmhost-x86-03.iad2.fedoraproject.org
@@ -698,10 +695,6 @@ vmhost-x86-06.iad2.fedoraproject.org
 vmhost-x86-07.iad2.fedoraproject.org
 qvmhost-x86-02.iad2.fedoraproject.org
 
-[virthost_comm]
-#virthost-comm01.qa.fedoraproject.org
-#virthost-comm03.qa.fedoraproject.org
-#virthost-comm04.qa.fedoraproject.org
 
 #[virthost_cloud]
 #virthost-aarch64-os01.fedorainfracloud.org
@@ -874,7 +867,6 @@ colo_virt
 virthost
 bvirthost
 buildvmhost
-virthost_comm
 #virthost_cloud
 
 [copr_front_aws]
diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml
index 1490da2919..563f4d0821 100644
--- a/playbooks/groups/bastion.yml
+++ b/playbooks/groups/bastion.yml
@@ -32,14 +32,3 @@
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
-- name: configure bastion-qa
-  hosts: bastion-comm01.qa.fedoraproject.org
-  user: root
-  gather_facts: True
-
-  tasks:
-  - name: install needed packages
-    package:
-      state: present
-      name:
-        - ipmitool