diff --git a/inventory/host_vars/db-s390-koji01.qa.fedoraproject.org b/inventory/host_vars/db-s390-koji01.s390.fedoraproject.org
similarity index 100%
rename from inventory/host_vars/db-s390-koji01.qa.fedoraproject.org
rename to inventory/host_vars/db-s390-koji01.s390.fedoraproject.org
diff --git a/inventory/host_vars/s390-koji01.qa.fedoraproject.org b/inventory/host_vars/s390-koji01.s390.fedoraproject.org
similarity index 100%
rename from inventory/host_vars/s390-koji01.qa.fedoraproject.org
rename to inventory/host_vars/s390-koji01.s390.fedoraproject.org
diff --git a/inventory/inventory b/inventory/inventory
index 35e7b8eda3..4302f559d3 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -268,7 +268,7 @@ db03.phx2.fedoraproject.org
 db-fas01.phx2.fedoraproject.org
 db-datanommer02.phx2.fedoraproject.org
 db-koji01.phx2.fedoraproject.org
-db-s390-koji01.qa.fedoraproject.org
+db-s390-koji01.s390.fedoraproject.org
 db-arm-koji01.qa.fedoraproject.org
 db-ppc-koji01.ppc.fedoraproject.org
 db-qa01.qa.fedoraproject.org
@@ -369,7 +369,7 @@ keys02.fedoraproject.org
 [koji]
 koji01.phx2.fedoraproject.org
 koji02.phx2.fedoraproject.org
-s390-koji01.qa.fedoraproject.org
+s390-koji01.s390.fedoraproject.org
 arm-koji01.qa.fedoraproject.org
 ppc-koji01.ppc.fedoraproject.org
 
@@ -839,7 +839,7 @@ qa09.qa.fedoraproject.org
 virthost-comm02.qa.fedoraproject.org
 virthost-comm03.qa.fedoraproject.org
 virthost-comm04.qa.fedoraproject.org
-virthost-s390.qa.fedoraproject.org
+virthost-s390.s390.fedoraproject.org
 
 [wiki-stg]
 wiki01.stg.phx2.fedoraproject.org
@@ -864,7 +864,7 @@ zanata2fedmsg01.stg.phx2.fedoraproject.org
 [fedmsg-qa-network]
 retrace01.qa.fedoraproject.org
 retrace02.qa.fedoraproject.org
-s390-koji01.qa.fedoraproject.org
+s390-koji01.s390.fedoraproject.org
 arm-koji01.qa.fedoraproject.org
 resultsdb01.qa.fedoraproject.org
 openqa01.qa.fedoraproject.org
diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml
index 49ed976c32..029f4a1cbc 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
 
-- include: "/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.qa.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org"
+- include: "/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-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.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.qa.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.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-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org
   user: root
   gather_facts: True
 
diff --git a/roles/hosts/files/kojibuilder-hosts b/roles/hosts/files/kojibuilder-hosts
index 4e341d6e0b..dc28ab6ffd 100644
--- a/roles/hosts/files/kojibuilder-hosts
+++ b/roles/hosts/files/kojibuilder-hosts
@@ -10,4 +10,4 @@
 # ppc koji infra
 10.5.129.240   ppc.koji.fedoraproject.org ppcpkgs.fedoraproject.org
 # s390 koji infra
-10.5.124.191   s390.koji.fedoraproject.org s390pkgs.fedoraproject.org
+10.5.129.180   s390.koji.fedoraproject.org s390pkgs.fedoraproject.org
diff --git a/roles/hosts/files/releng-hosts b/roles/hosts/files/releng-hosts
index 6bfbcc4ee8..ec219efec0 100644
--- a/roles/hosts/files/releng-hosts
+++ b/roles/hosts/files/releng-hosts
@@ -10,6 +10,6 @@
 # ppc koji infra
 10.5.129.240	ppc.koji.fedoraproject.org ppcpkgs.fedoraproject.org
 # s390 koji infra
-10.5.124.191	s390.koji.fedoraproject.org s390pkgs.fedoraproject.org
+10.5.129.180	s390.koji.fedoraproject.org s390pkgs.fedoraproject.org
 # Secondary signing server
 10.5.129.248	sigul-bridge secondary-signer
diff --git a/roles/hosts/files/secondary-hosts b/roles/hosts/files/secondary-hosts
index 6bfbcc4ee8..ec219efec0 100644
--- a/roles/hosts/files/secondary-hosts
+++ b/roles/hosts/files/secondary-hosts
@@ -10,6 +10,6 @@
 # ppc koji infra
 10.5.129.240	ppc.koji.fedoraproject.org ppcpkgs.fedoraproject.org
 # s390 koji infra
-10.5.124.191	s390.koji.fedoraproject.org s390pkgs.fedoraproject.org
+10.5.129.180	s390.koji.fedoraproject.org s390pkgs.fedoraproject.org
 # Secondary signing server
 10.5.129.248	sigul-bridge secondary-signer
diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index 270a61c8ef..5ce690657f 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -6,7 +6,7 @@ DBUser = koji
 {% if inventory_hostname.startswith('koji') %}
 DBHost = db-koji01
 DBPass = {{ kojiPassword }}
-{% elif inventory_hostname == 's390-koji01.qa.fedoraproject.org' %}
+{% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %}
 DBHost = db-s390-koji01
 DBPass = {{ s390kojiPassword }}
 {% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
@@ -46,7 +46,7 @@ DNUsernameComponent = CN
 {% if inventory_hostname.startswith('koji') %}
 ## separate multiple DNs with |
 ProxyDNs = emailAddress=buildsys@fedoraproject.org,CN=kojiweb,OU=Fedora Builders,O=Fedora Project,ST=North Carolina,C=US|emailAddress=releng@fedoraproject.org,CN=sign-bridge1,OU=Package Signing,O=Fedora Project,ST=North Carolina,C=US
-{% elif inventory_hostname == 's390-koji01.qa.fedoraproject.org' %}
+{% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %}
 ProxyDNs = /C=US/ST=North Carolina/O=Fedora Project/OU=Fedora Builders/CN=s390.koji.fedoraproject.org/emailAddress=buildsys@fedoraproject.org|emailAddress=buildsys@fedoraproject.org,CN=secondary-signer,OU=Fedora Builders,O=Fedora Project,ST=North Carolina,C=US
 {% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
 ProxyDNs = /C=US/ST=North Carolina/O=Fedora Project/OU=Fedora Builders/CN=arm.koji.fedoraproject.org/emailAddress=buildsys@fedoraproject.org|emailAddress=buildsys@fedoraproject.org,CN=secondary-signer,OU=Fedora Builders,O=Fedora Project,ST=North Carolina,C=US
@@ -62,7 +62,7 @@ ProxyDNs = /C=US/ST=North Carolina/O=Fedora Project/OU=Buildsys/CN=ppc.koji.fedo
 LoginCreatesUser = On
 {% if inventory_hostname.startswith('koji') %}
 KojiWebURL = http://koji.fedoraproject.org/koji
-{% elif inventory_hostname == 's390-koji01.qa.fedoraproject.org' %}
+{% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %}
 KojiWebURL = http://s390.koji.fedoraproject.org/koji
 {% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
 KojiWebURL = http://arm.koji.fedoraproject.org/koji
diff --git a/roles/koji_hub/templates/kojihub.conf.j2 b/roles/koji_hub/templates/kojihub.conf.j2
index 4a512b9cba..86b829e324 100644
--- a/roles/koji_hub/templates/kojihub.conf.j2
+++ b/roles/koji_hub/templates/kojihub.conf.j2
@@ -12,7 +12,7 @@ Alias /kojihub /usr/share/koji-hub/kojixmlrpc.py
     Require all granted
 </Directory>
 
-{% if inventory_hostname == 'arm-koji01.qa.fedoraproject.org' or inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' or inventory_hostname == 's390-koji01.qa.fedoraproject.org' %}
+{% if inventory_hostname == 'arm-koji01.qa.fedoraproject.org' or inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' or inventory_hostname == 's390-koji01.s390.fedoraproject.org' %}
 # Also serve /mnt/koji
 Alias /kojifiles "/mnt/koji/"
 
diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2
index 373111d803..4244136b11 100644
--- a/roles/koji_hub/templates/web.conf.j2
+++ b/roles/koji_hub/templates/web.conf.j2
@@ -6,7 +6,7 @@ SiteName = koji
 {% if env == 'staging' %}
 KojiHubURL = http://koji.stg.fedoraproject.org/kojihub
 KojiFilesURL = https://kojipkgs.stg.fedoraproject.org/
-{% elif inventory_hostname == 's390-koji01.qa.fedoraproject.org' %}
+{% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %}
 KojiHubURL = http://s390.koji.fedoraproject.org/kojihub
 KojiFilesURL = http://s390.koji.fedoraproject.org/kojifiles
 {% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}