diff --git a/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts
index ba0985309b..27a38db8a3 100644
--- a/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts
@@ -5,8 +5,8 @@
 10.5.126.23     infrastructure.fedoraproject.org
 10.5.126.83     pkgs.fedoraproject.org
 10.5.126.210    memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-kerneltest db-blockerbugs
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db
+10.5.126.85     db02.stg.fedoraproject.org db05 db-kerneltest
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-blockerbugs
 10.5.126.86     fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
 10.5.126.87     koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org
 10.5.125.36     kojipkgs.fedoraproject.org
diff --git a/roles/hosts/files/koschei01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koschei01.stg.phx2.fedoraproject.org-hosts
index af5c029de0..e42911818c 100644
--- a/roles/hosts/files/koschei01.stg.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/koschei01.stg.phx2.fedoraproject.org-hosts
@@ -5,8 +5,8 @@
 10.5.126.23     infrastructure.fedoraproject.org
 10.5.126.83     pkgs.fedoraproject.org
 10.5.126.210    memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-kerneltest db-blockerbugs
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db
+10.5.126.85     db02.stg.fedoraproject.org db05 db-kerneltest
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir db-notifs nuancier_db db-blockerbugs
 10.5.126.86     fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
 10.5.126.87     koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org
 
diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts
index fe3bd6e0cc..2b078b9fdc 100644
--- a/roles/hosts/files/staging-hosts
+++ b/roles/hosts/files/staging-hosts
@@ -6,7 +6,7 @@
 10.5.126.83     pkgs.fedoraproject.org
 10.5.126.81     app01.stg.fedoraproject.org bapp02
 10.5.126.210    memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-kerneltest db-blockerbugs
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs
+10.5.126.85     db02.stg.fedoraproject.org db05 db-kerneltest
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs db-blockerbugs
 10.5.126.86     fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all
 10.5.126.87     koji01.stg.phx2.fedoraproject.org koji.stg.fedoraproject.org koji01 kojipkgs kojipkgs.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org