diff --git a/inventory/host_vars/db-qa01.iad2.fedoraproject.org b/inventory/host_vars/db-qa01.iad2.fedoraproject.org
index ef991332a6..f50f0ee6a3 100644
--- a/inventory/host_vars/db-qa01.iad2.fedoraproject.org
+++ b/inventory/host_vars/db-qa01.iad2.fedoraproject.org
@@ -12,31 +12,15 @@ datacenter: iad2
 # This is a generic list, monitored by collectd
 databases:
 - postgres
-- buildmaster
-- execdb
 - openqa
-- resultsdb
-- vault
 
 # This is a more strict list, to be made publicly available
 dbs_to_backup:
 - postgres
-- buildmaster
-- buildmaster_dev
-- buildmaster_stg
-- execdb
-- execdb_stg
-- execdb_dev
 # these names are also stored as host vars 'openqa_dbname',
 # make sure to keep in sync
 - openqa
 - openqa-stg
-- resultsdb
-- resultsdb_stg
-- resultsdb_dev
-- vault_dev
-
-mariadb_root_password: "{{ dbqa01_mysql_root_password }}"
 
 # These are normally group variables, but in this case db servers are often different
 lvm_size: 300000
diff --git a/inventory/host_vars/openqa-stg01.iad2.fedoraproject.org b/inventory/host_vars/openqa-stg01.iad2.fedoraproject.org
new file mode 100644
index 0000000000..eede82a692
--- /dev/null
+++ b/inventory/host_vars/openqa-stg01.iad2.fedoraproject.org
@@ -0,0 +1,32 @@
+---
+############################################################
+# networking
+############################################################
+
+nm: 255.255.255.0
+gw: 10.3.175.254
+dns: 10.3.163.33
+eth0_ip: 10.3.175.53
+
+############################################################
+# install
+############################################################
+
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
+volgroup: /dev/vg_guests
+vmhost: qvmhost-x86-02.iad2.fedoraproject.org
+datacenter: iad2
+
+############################################################
+# virtual machine
+############################################################
+
+fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran
+
+lvm_size: 768000
+mem_size: 16384
+num_cpus: 10
+
+nrpe_procs_warn: 250
+nrpe_procs_crit: 300
diff --git a/inventory/host_vars/openqa01.iad2.fedoraproject.org b/inventory/host_vars/openqa01.iad2.fedoraproject.org
new file mode 100644
index 0000000000..3f84661b81
--- /dev/null
+++ b/inventory/host_vars/openqa01.iad2.fedoraproject.org
@@ -0,0 +1,32 @@
+---
+############################################################
+# networking
+############################################################
+
+nm: 255.255.255.0
+gw: 10.3.174.254
+dns: 10.3.163.33
+eth0_ip: 10.3.174.52
+
+############################################################
+# install
+############################################################
+
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8-iad2
+ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/
+volgroup: /dev/vg_guests
+vmhost: qvmhost-x86-02.iad2.fedoraproject.org
+datacenter: iad2
+
+############################################################
+# virtual machine
+############################################################
+
+fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran
+
+lvm_size: 500000
+mem_size: 16384
+num_cpus: 8
+
+nrpe_procs_warn: 250
+nrpe_procs_crit: 300
diff --git a/inventory/inventory b/inventory/inventory
index 9235782f53..adb58f2214 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -235,9 +235,7 @@ db-koji02.phx2.fedoraproject.org
 db-qa01.qa.fedoraproject.org
 db-qa02.qa.fedoraproject.org
 db-qa03.qa.fedoraproject.org
-#db-qa01.iad2.fedoraproject.org
-#db-qa02.iad2.fedoraproject.org
-#db-qa03.iad2.fedoraproject.org
+db-qa01.iad2.fedoraproject.org
 
 [dbserver_stg]
 db-fas01.stg.phx2.fedoraproject.org
@@ -522,12 +520,12 @@ odcs_backend
 [openqa_common]
 openqa01.qa.fedoraproject.org
 openqa-stg01.qa.fedoraproject.org
+openqa01.iad2.fedoraproject.org
+openqa-stg01.iad2.fedoraproject.org
 
 [openqa]
 openqa01.qa.fedoraproject.org
-
-[openqa_iad2]
-#openqa01.iad2.fedoraproject.org
+openqa01.iad2.fedoraproject.org
 
 [openqa_workers]
 qa02.qa.fedoraproject.org
@@ -537,6 +535,7 @@ qa14.qa.fedoraproject.org
 # openqa-stg and openqa-stg-workers are pseudo-stg, see group_vars/openqa-stg for more details
 [openqa_stg]
 openqa-stg01.qa.fedoraproject.org
+openqa-stg01.iad2.fedoraproject.org
 
 [openqa_stg_workers]
 qa01.qa.fedoraproject.org
@@ -640,6 +639,7 @@ openqa-stg01.qa.fedoraproject.org
 openqa01.qa.fedoraproject.org
 openqa-stg01.qa.fedoraproject.org
 #openqa01.iad2.fedoraproject.org
+#openqa-stg01.iad2.fedoraproject.org
 
 # This group should only ever contain *ONE* system
 [checkcompose]
@@ -648,6 +648,7 @@ openqa01.qa.fedoraproject.org
 
 [checkcompose_stg]
 openqa-stg01.qa.fedoraproject.org
+#openqa-stg01.iad2.fedoraproject.org
 
 [resultsdb:children]
 resultsdb_stg
@@ -1331,6 +1332,7 @@ db03.iad2.fedoraproject.org
 db-datanommer01.iad2.fedoraproject.org
 db-fas01.iad2.fedoraproject.org
 db-koji01.iad2.fedoraproject.org
+db-qa01.iad2.fedoraproject.org
 dl01.iad2.fedoraproject.org
 dl02.iad2.fedoraproject.org
 dl03.iad2.fedoraproject.org
@@ -1360,6 +1362,7 @@ odcs-frontend01.iad2.fedoraproject.org
 odcs-backend01.iad2.fedoraproject.org
 oci-registry01.iad2.fedoraproject.org
 oci-candidate-registry01.iad2.fedoraproject.org
+openqa01.iad2.fedoraproject.org
 osbs-control01.iad2.fedoraproject.org
 osbs-master01.iad2.fedoraproject.org
 osbs-node01.iad2.fedoraproject.org
@@ -1402,10 +1405,6 @@ vmhost-x86-05.iad2.fedoraproject.org
 vmhost-x86-06.iad2.fedoraproject.org
 vmhost-x86-07.iad2.fedoraproject.org
 wiki01.iad2.fedoraproject.org
-#openqa01.iad2.fedoraproject.org
-#db-qa01.iad2.fedoraproject.org
-#db-qa02.iad2.fedoraproject.org
-#db-qa03.iad2.fedoraproject.org
 
 [iad2:vars]
 ansible_group_priority=10