diff --git a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts
index b35e9efd38..82bbba3f97 100644
--- a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts
@@ -7,8 +7,8 @@
 10.5.126.88     proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org admin.stg.fedoraproject.org
 10.5.126.23     infrastructure.fedoraproject.org
 10.5.126.81     app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-ask db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
+10.5.126.85     db02.stg.fedoraproject.org db05 db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
 10.5.126.86     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.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org
 # We need to point to production internal kojipkgs so stg can download rpms
diff --git a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts
index e9c13a6938..a1fdc9ae1b 100644
--- a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts
@@ -5,8 +5,8 @@
 10.5.126.23     infrastructure.fedoraproject.org
 10.5.125.44     pkgs.fedoraproject.org
 10.5.126.81     app01.stg.fedoraproject.org bapp02 memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-ask db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
+10.5.126.85     db02.stg.fedoraproject.org db05 db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
 10.5.126.86     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/hotness01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts
index e9c13a6938..a1fdc9ae1b 100644
--- a/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts
@@ -5,8 +5,8 @@
 10.5.126.23     infrastructure.fedoraproject.org
 10.5.125.44     pkgs.fedoraproject.org
 10.5.126.81     app01.stg.fedoraproject.org bapp02 memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-ask db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
+10.5.126.85     db02.stg.fedoraproject.org db05 db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
 10.5.126.86     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/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts
index f895745094..5b88256412 100644
--- a/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts
@@ -7,8 +7,8 @@
 10.5.126.88     proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 fedoraproject.org admin.stg.fedoraproject.org
 10.5.126.23     infrastructure.fedoraproject.org
 10.5.126.81     app01.stg.fedoraproject.org memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-ask db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
+10.5.126.85     db02.stg.fedoraproject.org db05 db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
 10.5.126.86     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.stg.phx2.fedoraproject.org kojipkgs.stg.fedoraproject.org
 # We need to point to production internal kojipkgs so stg can download rpms
diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts
index 4b7152dd00..154e21268a 100644
--- a/roles/hosts/files/staging-hosts
+++ b/roles/hosts/files/staging-hosts
@@ -5,7 +5,7 @@
 10.5.126.23     infrastructure.fedoraproject.org
 10.5.126.83     pkgs.fedoraproject.org
 10.5.126.81     app01.stg.fedoraproject.org bapp02 memcached01 memcached02 memcached03 memcached04
-10.5.126.85     db02.stg.fedoraproject.org db05 db-ask db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db db-blockerbugs
-10.5.126.204    db01.stg.phx2.fedoraproject.org db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
+10.5.126.85     db02.stg.fedoraproject.org db05 db-tahrir db-elections db-fedocal db-github2fedmsg db-kerneltest db-notifs nuancier_db db-pkgdb2 db-summershum tagger_db db-blockerbugs
+10.5.126.204    db01.stg.phx2.fedoraproject.org db-ask db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org
 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