diff --git a/fifloader.py b/fifloader.py
index 9194f17d..7da8f642 100755
--- a/fifloader.py
+++ b/fifloader.py
@@ -212,6 +212,11 @@ def generate_job_templates(products, profiles, testsuites):
                     jobtemplate['group_name'] = "Rocky PowerPC Updates"
                 else:
                     jobtemplate['group_name'] = "Rocky PowerPC"
+            elif jobtemplate['machine_name'] in ('s390x'):
+                if 'updates' in product['flavor']:
+                    jobtemplate['group_name'] = "Rocky s390x Updates"
+                else:
+                    jobtemplate['group_name'] = "Rocky s390x"
             elif jobtemplate['machine_name'] in ('aarch64', 'ARM'):
                 if 'updates' in product['flavor']:
                     jobtemplate['group_name'] = "Rocky AArch64 Updates"
diff --git a/templates.fif.json b/templates.fif.json
index de94fc71..7da97880 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -348,7 +348,7 @@
         },
         "rocky-boot-iso-s390x-*-s390x": {
             "machine": "s390x",
-            "product": "rocky-boot-iso-ppc64le-*"
+            "product": "rocky-boot-iso-s390x-*"
         },
         "rocky-boot-iso-ppc64le-*-ppc64le": {
             "machine": "ppc64le",
@@ -368,7 +368,7 @@
         },
         "rocky-minimal-iso-s390x-*-s390x": {
             "machine": "s390x",
-            "product": "rocky-minimal-iso-ppc64le-*"
+            "product": "rocky-minimal-iso-s390x-*"
         },
         "rocky-minimal-iso-ppc64le-*-ppc64le": {
             "machine": "ppc64le",
@@ -384,7 +384,7 @@
         },
         "rocky-dvd-iso-s390x-*-s390x": {
             "machine": "s390x",
-            "product": "rocky-dvd-iso-ppc64le-*"
+            "product": "rocky-dvd-iso-s390x-*"
         },
         "rocky-dvd-iso-ppc64le-*-ppc64le": {
             "machine": "ppc64le",
@@ -404,7 +404,7 @@
         },
         "rocky-package-set-s390x-*-s390x": {
             "machine": "s390x",
-            "product": "rocky-package-set-ppc64le-*"
+            "product": "rocky-package-set-s390x-*"
         },
         "rocky-package-set-ppc64le-*-ppc64le": {
             "machine": "ppc64le",
@@ -424,7 +424,7 @@
         },
         "rocky-universal-s390x-*-s390x": {
             "machine": "s390x",
-            "product": "rocky-universal-ppc64le-*"
+            "product": "rocky-universal-s390x-*"
         },
         "rocky-universal-ppc64le-*-ppc64le": {
             "machine": "ppc64le",