diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 70af24eb..69cc2f54 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -106,8 +106,7 @@
     "Products": {
         "fedora-updates-cloud-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-cloud",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-cloud"
         },
         "fedora-updates-cloud-x86_64-*": {
             "arch": "x86_64",
@@ -115,8 +114,7 @@
         },
         "fedora-updates-container-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-container",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-container"
         },
         "fedora-updates-container-ppc64le-*": {
             "arch": "ppc64le",
@@ -129,8 +127,7 @@
         },
         "fedora-updates-everything-boot-iso-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-everything-boot-iso",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-everything-boot-iso"
         },
         "fedora-updates-everything-boot-iso-x86_64-*": {
             "arch": "x86_64",
@@ -138,8 +135,7 @@
         },
         "fedora-updates-kde-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-kde",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-kde"
         },
         "fedora-updates-kde-x86_64-*": {
             "arch": "x86_64",
@@ -147,8 +143,7 @@
         },
         "fedora-updates-server-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-server",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-server"
         },
         "fedora-updates-server-ppc64le-*": {
             "arch": "ppc64le",
@@ -157,8 +152,7 @@
         },
         "fedora-updates-server-upgrade-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-server-upgrade",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-server-upgrade"
         },
         "fedora-updates-server-upgrade-ppc64le-*": {
             "arch": "ppc64le",
@@ -187,8 +181,7 @@
         },
         "fedora-updates-workstation-upgrade-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-workstation-upgrade",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-workstation-upgrade"
         },
         "fedora-updates-workstation-upgrade-x86_64-*": {
             "arch": "x86_64",
@@ -196,8 +189,7 @@
         },
         "fedora-updates-workstation-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "updates-workstation",
-            "group_name": "Fedora AArch64 Updates"
+            "flavor": "updates-workstation"
         },
         "fedora-updates-workstation-x86_64-*": {
             "arch": "x86_64",
diff --git a/templates.fif.json b/templates.fif.json
index eceeda0e..78c5feba 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -261,8 +261,7 @@
         },
         "fedora-Cloud_Base-qcow2-qcow2-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "Cloud_Base-qcow2-qcow2",
-            "group_name": "Fedora AArch64"
+            "flavor": "Cloud_Base-qcow2-qcow2"
         },
         "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*": {
             "arch": "ppc64le",
@@ -288,8 +287,7 @@
         },
         "fedora-IoT-dvd_ostree-iso-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "IoT-dvd_ostree-iso",
-            "group_name": "Fedora AArch64"
+            "flavor": "IoT-dvd_ostree-iso"
         },
         "fedora-IoT-dvd_ostree-iso-x86_64-*": {
             "arch": "x86_64",
@@ -301,8 +299,7 @@
         },
         "fedora-KDE-raw_xz-raw.xz-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "KDE-raw_xz-raw.xz",
-            "group_name": "Fedora AArch64"
+            "flavor": "KDE-raw_xz-raw.xz"
         },
         "fedora-i3-live-x86_64*": {
             "arch": "x86_64",
@@ -310,13 +307,11 @@
         },
         "fedora-Minimal-raw_xz-raw.xz-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "Minimal-raw_xz-raw.xz",
-            "group_name": "Fedora AArch64"
+            "flavor": "Minimal-raw_xz-raw.xz"
         },
         "fedora-Server-boot-iso-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "Server-boot-iso",
-            "group_name": "Fedora AArch64"
+            "flavor": "Server-boot-iso"
         },
         "fedora-Server-boot-iso-ppc64le-*": {
             "arch": "ppc64le",
@@ -329,8 +324,7 @@
         },
         "fedora-Server-dvd-iso-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "Server-dvd-iso",
-            "group_name": "Fedora AArch64"
+            "flavor": "Server-dvd-iso"
         },
         "fedora-Server-dvd-iso-ppc64le-*": {
             "arch": "ppc64le",
@@ -343,8 +337,7 @@
         },
         "fedora-Server-raw_xz-raw.xz-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "Server-raw_xz-raw.xz",
-            "group_name": "Fedora AArch64"
+            "flavor": "Server-raw_xz-raw.xz"
         },
         "fedora-Silverblue-dvd_ostree-iso-ppc64le-*": {
             "arch": "ppc64le",
@@ -370,18 +363,15 @@
         },
         "fedora-Workstation-raw_xz-raw.xz-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "Workstation-raw_xz-raw.xz",
-            "group_name": "Fedora AArch64"
+            "flavor": "Workstation-raw_xz-raw.xz"
         },
         "fedora-Workstation-upgrade-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "Workstation-upgrade",
-            "group_name": "Fedora AArch64"
+            "flavor": "Workstation-upgrade"
         },
         "fedora-universal-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "universal",
-            "group_name": "Fedora AArch64"
+            "flavor": "universal"
         },
         "fedora-universal-ppc64le-*": {
             "arch": "ppc64le",
@@ -394,8 +384,7 @@
         },
         "fedora-seasonal-aarch64-*": {
             "arch": "aarch64",
-            "flavor": "seasonal",
-            "group_name": "Fedora AArch64"
+            "flavor": "seasonal"
         },
         "fedora-seasonal-ppc64le-*": {
             "arch": "ppc64le",