diff --git a/inventory/host_vars/db-qa-stg01.qa.fedoraproject.org b/inventory/host_vars/db-qa-stg01.qa.fedoraproject.org
deleted file mode 100644
index 5efbd388ee..0000000000
--- a/inventory/host_vars/db-qa-stg01.qa.fedoraproject.org
+++ /dev/null
@@ -1,75 +0,0 @@
----
-############################################################
-# general
-############################################################
-
-datacenter: phx2
-fas_client_groups: sysadmin-qa,sysadmin-noc,sysadmin-veteran
-
-
-############################################################
-# networking
-############################################################
-
-nm: 255.255.255.0
-gw: 10.5.124.254
-dns: 10.5.126.21
-eth0_ip: 10.5.124.145
-eth0_nm: 255.255.255.128
-
-
-############################################################
-# install
-############################################################
-
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
-volgroup: /dev/vg_guests
-sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
-vmhost: virthost-comm04.qa.fedoraproject.org
-
-
-############################################################
-# virtual machine
-############################################################
-
-# These are normally group variables, but in this case db servers are often different
-lvm_size: 300000
-mem_size: 8192
-num_cpus: 2
-tcp_ports: [ 5432, 443 ]
-
-
-############################################################
-# database details
-############################################################
-
-# This is a generic list, monitored by collectd
-databases:
-- postgres
-#- resultsdb
-
-# 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
-
-
-# kernel SHMMAX value
-kernel_shmmax: 68719476736
-
-db_backup_dir: ['/backups']
-shared_buffers: "2GB"
-effective_cache_size: "6GB"
diff --git a/inventory/inventory b/inventory/inventory
index dbe8c23298..e73021e1c8 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -302,7 +302,6 @@ db-koji01.phx2.fedoraproject.org
 db-s390-koji01.s390.fedoraproject.org
 db-qa01.qa.fedoraproject.org
 db-qa02.qa.fedoraproject.org
-db-qa-stg01.qa.fedoraproject.org
 
 [dbserver-stg]
 db-fas01.stg.phx2.fedoraproject.org
@@ -856,7 +855,6 @@ kojipkgs02.phx2.fedoraproject.org
 ns03.phx2.fedoraproject.org
 ns04.phx2.fedoraproject.org
 db-qa01.qa.fedoraproject.org
-db-qa-stg01.qa.fedoraproject.org
 proxy01.phx2.fedoraproject.org
 proxy10.phx2.fedoraproject.org
 proxy101.phx2.fedoraproject.org
diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml
index ffc0c9325f..90a78786b6 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-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.s390.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.fedoraproject.org"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.s390.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.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-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.s390.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.fedoraproject.org
+  hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.s390.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
diff --git a/roles/rkhunter/templates/rkhunter.conf.j2 b/roles/rkhunter/templates/rkhunter.conf.j2
index 840b3cca93..d452836dfc 100644
--- a/roles/rkhunter/templates/rkhunter.conf.j2
+++ b/roles/rkhunter/templates/rkhunter.conf.j2
@@ -404,7 +404,7 @@ ALLOWDEVFILE=/dev/shm/spice.*
 {% if inventory_hostname in groups['ipa'] or inventory_hostname in groups['ipa-stg'] %}
 ALLOWDEVFILE=/dev/shm/sem.slapd*.stats
 {% endif %}
-{% if inventory_hostname in groups['pgbdr'] or inventory_hostname in groups['pgbdr-stg'] or inventory_hostname == 'ci-cc-rdu01.fedoraproject.org' or inventory_hostname == 'db-qa-stg01.qa.fedoraproject.org' or inventory_hostname == 'hubs01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-koji02.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-koji01.stg.phx2.fedoraproject.org' %}
+{% if inventory_hostname in groups['pgbdr'] or inventory_hostname in groups['pgbdr-stg'] or inventory_hostname == 'ci-cc-rdu01.fedoraproject.org' or  inventory_hostname == 'hubs01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-koji02.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-koji01.stg.phx2.fedoraproject.org' %}
 ALLOWDEVFILE=/dev/shm/PostgreSQL*
 {% endif %}