diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 1962f9fc..df88f08b 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -1,118 +1,40 @@
 {
-    "Products": {
-        "fedora-updates-container-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "updates-container",
+    "Flavors": {
+        "updates-container": {
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
-            },
-            "version": "*"
+            }
         },
-        "fedora-updates-container-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "updates-container",
-            "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
-                "NUMDISKS": "2",
-                "RETRY": "1"
-            },
-            "version": "*"
-        },
-        "fedora-updates-container-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-container",
-            "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
-                "KIWI_PROFILE": "Container-Base-Generic",
-                "NUMDISKS": "2",
-                "RETRY": "1"
-            },
-            "version": "*"
-        },
-        "fedora-updates-everything-boot-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-everything-boot-iso",
+        "updates-everything-boot-iso": {
             "settings": {
                 "NUMDISKS": "2",
                 "RETRY": "1"
-            },
-            "version": "*"
+            }
         },
-        "fedora-updates-kde-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-kde",
+        "updates-kde": {
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_kde_5_%ARCH%.qcow2",
                 "DESKTOP": "kde",
                 "NUMDISKS": "2",
                 "RETRY": "1"
-            },
-            "version": "*"
+            }
         },
-        "fedora-updates-server-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "updates-server",
+        "updates-server": {
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
-            },
-            "version": "*"
+            }
         },
-        "fedora-updates-server-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "updates-server",
-            "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
-                "NUMDISKS": "2",
-                "RETRY": "1"
-            },
-            "version": "*"
-        },
-        "fedora-updates-server-upgrade-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "updates-server-upgrade",
+        "updates-server-upgrade": {
             "settings": {
                 "NUMDISKS": "2",
                 "RETRY": "1"
-            },
-            "version": "*"
+            }
         },
-        "fedora-updates-server-upgrade-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-server-upgrade",
-            "settings": {
-                "NUMDISKS": "2",
-                "RETRY": "1"
-            },
-            "version": "*"
-        },
-        "fedora-updates-server-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-server",
-            "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
-                "NUMDISKS": "2",
-                "RETRY": "1"
-            },
-            "version": "*"
-        },
-        "fedora-updates-silverblue-dvd_ostree-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-silverblue-dvd_ostree-iso",
+        "updates-silverblue-dvd_ostree-iso": {
             "settings": {
                 "CANNED": "1",
                 "DESKTOP": "gnome",
@@ -122,13 +44,9 @@
                 "PACKAGE_SET": "default",
                 "RETRY": "2",
                 "SUBVARIANT": "Silverblue"
-            },
-            "version": "*"
+            }
         },
-        "fedora-updates-workstation-live-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-workstation-live-iso",
+        "updates-workstation-live-iso": {
             "settings": {
                 "DESKTOP": "gnome",
                 "HDDSIZEGB": "15",
@@ -138,13 +56,9 @@
                 "PACKAGE_SET": "default",
                 "RETRY": "1",
                 "SUBVARIANT": "Workstation"
-            },
-            "version": "*"
+            }
         },
-        "fedora-updates-kde-live-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "updates-kde-live-iso",
+        "updates-kde-live-iso": {
             "settings": {
                 "DESKTOP": "kde",
                 "HDDSIZEGB": "15",
@@ -154,30 +68,116 @@
                 "PACKAGE_SET": "default",
                 "RETRY": "1",
                 "SUBVARIANT": "KDE"
+            }
+        },
+        "updates-workstation-upgrade": {
+            "settings": {
+                "DESKTOP": "gnome",
+                "NUMDISKS": "2",
+                "RETRY": "1"
+            }
+        },
+        "updates-workstation": {
+            "settings": {
+                "DESKTOP": "gnome",
+                "+HDD_1": "disk_f%VERSION%_desktop_5_%ARCH%.qcow2",
+                "NUMDISKS": "2",
+                "RETRY": "1"
+            }
+        }
+    },
+    "Products": {
+        "fedora-updates-container-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "updates-container",
+            "version": "*"
+        },
+        "fedora-updates-container-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "updates-container",
+            "version": "*"
+        },
+        "fedora-updates-container-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-container",
+            "settings": {
+                "KIWI_PROFILE": "Container-Base-Generic"
             },
             "version": "*"
         },
+        "fedora-updates-everything-boot-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-everything-boot-iso",
+            "version": "*"
+        },
+        "fedora-updates-kde-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-kde",
+            "version": "*"
+        },
+        "fedora-updates-server-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "updates-server",
+            "version": "*"
+        },
+        "fedora-updates-server-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "updates-server",
+            "version": "*"
+        },
+        "fedora-updates-server-upgrade-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "updates-server-upgrade",
+            "version": "*"
+        },
+        "fedora-updates-server-upgrade-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-server-upgrade",
+            "version": "*"
+        },
+        "fedora-updates-server-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-server",
+            "version": "*"
+        },
+        "fedora-updates-silverblue-dvd_ostree-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-silverblue-dvd_ostree-iso",
+            "version": "*"
+        },
+        "fedora-updates-workstation-live-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-workstation-live-iso",
+            "version": "*"
+        },
+        "fedora-updates-kde-live-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "updates-kde-live-iso",
+            "version": "*"
+        },
         "fedora-updates-workstation-upgrade-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "updates-workstation-upgrade",
-            "settings": {
-                "DESKTOP": "gnome",
-                "NUMDISKS": "2",
-                "RETRY": "1"
-            },
             "version": "*"
         },
         "fedora-updates-workstation-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "updates-workstation",
-            "settings": {
-                "DESKTOP": "gnome",
-                "+HDD_1": "disk_f%VERSION%_desktop_5_%ARCH%.qcow2",
-                "NUMDISKS": "2",
-                "RETRY": "1"
-            },
             "version": "*"
         }
     },
diff --git a/templates.fif.json b/templates.fif.json
index ef9053e5..f09b5b7b 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -79,33 +79,22 @@
             }
         }
     },
-    "Products": {
-        "fedora-BaseOS-boot-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "BaseOS-boot-iso",
+    "Flavors": {
+        "BaseOS-boot-iso": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "+QEMUCPU": "host",
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-BaseOS-dvd-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "BaseOS-dvd-iso",
+        "BaseOS-dvd-iso": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "+QEMUCPU": "host",
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Cloud_Base-qcow2-qcow2-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "Cloud_Base-qcow2-qcow2",
+        "Cloud_Base-qcow2-qcow2": {
             "settings": {
                 "BOOTFROM": "c",
                 "DEPLOY_UPLOAD_TEST": "",
@@ -113,96 +102,30 @@
                 "ISO": "cloudinit.iso",
                 "ROOT_PASSWORD": "weakpassword",
                 "TEST_TARGET": "HDD_1"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "Cloud_Base-qcow2-qcow2",
-            "settings": {
-                "BOOTFROM": "c",
-                "DEPLOY_UPLOAD_TEST": "",
-                "+HDD_1": "%HDD_2%",
-                "ISO": "cloudinit.iso",
-                "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "HDD_1"
-            },
-            "version": "*"
-        },
-        "fedora-Cloud_Base-qcow2-qcow2-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "Cloud_Base-qcow2-qcow2",
-            "settings": {
-                "BOOTFROM": "c",
-                "DEPLOY_UPLOAD_TEST": "",
-                "+HDD_1": "%HDD_2%",
-                "ISO": "cloudinit.iso",
-                "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "HDD_1"
-            },
-            "version": "*"
-        },
-        "fedora-CoreOS-colive-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "CoreOS-colive-iso",
+        "CoreOS-colive-iso": {
             "settings": {
                 "CANNED": "1",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "TEST_TARGET": "ISO",
                 "USER_LOGIN": "false"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Everything-boot-iso-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "Everything-boot-iso",
+        "Everything-boot-iso": {
             "settings": {
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Everything-boot-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "Everything-boot-iso",
-            "settings": {
-                "+QEMURAM": 3072,
-                "TEST_TARGET": "ISO"
-            },
-            "version": "*"
-        },
-        "fedora-IoT-dvd_ostree-iso-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "IoT-dvd_ostree-iso",
+        "IoT-dvd_ostree-iso": {
             "settings": {
                 "CANNED": "1",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-IoT-dvd_ostree-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "IoT-dvd_ostree-iso",
-            "settings": {
-                "CANNED": "1",
-                "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "PACKAGE_SET": "default",
-                "TEST_TARGET": "ISO"
-            },
-            "version": "*"
-        },
-        "fedora-KDE-live-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "KDE-live-iso",
+        "KDE-live-iso": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "DESKTOP": "kde",
@@ -211,13 +134,9 @@
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-i3-live-x86_64*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "i3-live-iso",
+        "i3-live-iso": {
             "settings": {
                 "DESKTOP": "i3",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
@@ -226,105 +145,32 @@
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO",
                 "USER_LOGIN": "i3-user"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Minimal-raw_xz-raw.xz-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "Minimal-raw_xz-raw.xz",
+        "Minimal-raw_xz-raw.xz": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_arm_image_deployment_upload",
                 "TEST_TARGET": "HDD_2"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Server-boot-iso-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "Server-boot-iso",
+        "Server-boot-iso": {
             "settings": {
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Server-boot-iso-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "Server-boot-iso",
-            "settings": {
-                "TEST_TARGET": "ISO"
-            },
-            "version": "*"
-        },
-        "fedora-Server-boot-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "Server-boot-iso",
-            "settings": {
-                "+QEMURAM": 3072,
-                "TEST_TARGET": "ISO"
-            },
-            "version": "*"
-        },
-        "fedora-Server-dvd-iso-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "Server-dvd-iso",
+        "Server-dvd-iso": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Server-dvd-iso-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "Server-dvd-iso",
-            "settings": {
-                "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "TEST_TARGET": "ISO"
-            },
-            "version": "*"
-        },
-        "fedora-Server-dvd-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "Server-dvd-iso",
-            "settings": {
-                "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "TEST_TARGET": "ISO"
-            },
-            "version": "*"
-        },
-        "fedora-Server-raw_xz-raw.xz-aarch64-*": {
-            "arch": "aarch64",
-            "distri": "fedora",
-            "flavor": "Server-raw_xz-raw.xz",
+        "Server-raw_xz-raw.xz": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_arm_image_deployment_upload",
                 "TEST_TARGET": "HDD_2"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Silverblue-dvd_ostree-iso-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "Silverblue-dvd_ostree-iso",
-            "settings": {
-                "CANNED": "1",
-                "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "DESKTOP": "gnome",
-                "HDDSIZEGB": "20",
-                "PACKAGE_SET": "default",
-                "TEST_TARGET": "ISO"
-            },
-            "version": "*"
-        },
-        "fedora-Silverblue-dvd_ostree-iso-x86_64-*": {
-            "arch": "x86_64",
-            "distri": "fedora",
-            "flavor": "Silverblue-dvd_ostree-iso",
+        "Silverblue-dvd_ostree-iso": {
             "settings": {
                 "CANNED": "1",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
@@ -333,13 +179,9 @@
                 "PACKAGE_SET": "default",
                 "RETRY": "2",
                 "TEST_TARGET": "ISO"
-            },
-            "version": "*"
+            }
         },
-        "fedora-Workstation-live-iso-ppc64le-*": {
-            "arch": "ppc64le",
-            "distri": "fedora",
-            "flavor": "Workstation-live-iso",
+        "Workstation-live-iso": {
             "settings": {
                 "DESKTOP": "gnome",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
@@ -347,21 +189,196 @@
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
+            }
+        },
+        "Workstation-live_osbuild-iso": {
+            "settings": {
+                "DESKTOP": "gnome",
+                "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "HDDSIZEGB": "20",
+                "INSTALL_RETRY": "5",
+                "LIVE": "1",
+                "PACKAGE_SET": "default",
+                "TEST_TARGET": "ISO"
+            }
+        },
+        "Workstation-upgrade": {
+            "settings": {
+                "DESKTOP": "gnome",
+                "DEPLOY_UPLOAD_TEST": "upgrade_desktop",
+                "HDDSIZEGB": "20",
+                "TEST_TARGET": "COMPOSE"
+            }
+        },
+        "Workstation-raw_xz-raw.xz": {
+            "settings": {
+                "DEPLOY_UPLOAD_TEST": "install_arm_image_deployment_upload",
+                "DESKTOP": "gnome",
+                "TEST_TARGET": "HDD_2"
+            }
+        },
+        "universal": {
+            "settings": {
+                "TEST_TARGET": "COMPOSE"
+            }
+        },
+        "seasonal": {
+            "settings": {
+                "TEST_TARGET": "ISO"
+            }
+        }
+    },
+    "Products": {
+        "fedora-BaseOS-boot-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "BaseOS-boot-iso",
+            "version": "*"
+        },
+        "fedora-BaseOS-dvd-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "BaseOS-dvd-iso",
+            "version": "*"
+        },
+        "fedora-Cloud_Base-qcow2-qcow2-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "Cloud_Base-qcow2-qcow2",
+            "version": "*"
+        },
+        "fedora-Cloud_Base-qcow2-qcow2-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "Cloud_Base-qcow2-qcow2",
+            "version": "*"
+        },
+        "fedora-Cloud_Base-qcow2-qcow2-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "Cloud_Base-qcow2-qcow2",
+            "version": "*"
+        },
+        "fedora-CoreOS-colive-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "CoreOS-colive-iso",
+            "version": "*"
+        },
+        "fedora-Everything-boot-iso-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "Everything-boot-iso",
+            "version": "*"
+        },
+        "fedora-Everything-boot-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "Everything-boot-iso",
+            "settings": {
+                "+QEMURAM": 3072
             },
             "version": "*"
         },
+        "fedora-IoT-dvd_ostree-iso-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "IoT-dvd_ostree-iso",
+            "version": "*"
+        },
+        "fedora-IoT-dvd_ostree-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "IoT-dvd_ostree-iso",
+            "version": "*"
+        },
+        "fedora-KDE-live-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "KDE-live-iso",
+            "version": "*"
+        },
+        "fedora-i3-live-x86_64*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "i3-live-iso",
+            "version": "*"
+        },
+        "fedora-Minimal-raw_xz-raw.xz-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "Minimal-raw_xz-raw.xz",
+            "version": "*"
+        },
+        "fedora-Server-boot-iso-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "Server-boot-iso",
+            "version": "*"
+        },
+        "fedora-Server-boot-iso-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "Server-boot-iso",
+            "version": "*"
+        },
+        "fedora-Server-boot-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "Server-boot-iso",
+            "settings": {
+                "+QEMURAM": 3072
+            },
+            "version": "*"
+        },
+        "fedora-Server-dvd-iso-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "Server-dvd-iso",
+            "version": "*"
+        },
+        "fedora-Server-dvd-iso-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "Server-dvd-iso",
+            "version": "*"
+        },
+        "fedora-Server-dvd-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "Server-dvd-iso",
+            "version": "*"
+        },
+        "fedora-Server-raw_xz-raw.xz-aarch64-*": {
+            "arch": "aarch64",
+            "distri": "fedora",
+            "flavor": "Server-raw_xz-raw.xz",
+            "version": "*"
+        },
+        "fedora-Silverblue-dvd_ostree-iso-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "Silverblue-dvd_ostree-iso",
+            "version": "*"
+        },
+        "fedora-Silverblue-dvd_ostree-iso-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "fedora",
+            "flavor": "Silverblue-dvd_ostree-iso",
+            "version": "*"
+        },
+        "fedora-Workstation-live-iso-ppc64le-*": {
+            "arch": "ppc64le",
+            "distri": "fedora",
+            "flavor": "Workstation-live-iso",
+            "version": "*"
+        },
         "fedora-Workstation-live-iso-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "Workstation-live-iso",
             "settings": {
-                "DESKTOP": "gnome",
-                "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "HDDSIZEGB": "20",
-                "INSTALL_RETRY": "5",
-                "LIVE": "1",
-                "PACKAGE_SET": "default",
-                "TEST_TARGET": "ISO"
+                "INSTALL_RETRY": "5"
             },
             "version": "*"
         },
@@ -369,104 +386,60 @@
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "Workstation-live_osbuild-iso",
-            "settings": {
-                "DESKTOP": "gnome",
-                "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "HDDSIZEGB": "20",
-                "INSTALL_RETRY": "5",
-                "LIVE": "1",
-                "PACKAGE_SET": "default",
-                "TEST_TARGET": "ISO"
-            },
             "version": "*"
         },
         "fedora-Workstation-upgrade-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "Workstation-upgrade",
-            "settings": {
-                "DESKTOP": "gnome",
-                "DEPLOY_UPLOAD_TEST": "upgrade_desktop",
-                "HDDSIZEGB": "20",
-                "PACKAGE_SET": "default",
-                "TEST_TARGET": "COMPOSE"
-            },
             "version": "*"
         },
         "fedora-Workstation-raw_xz-raw.xz-aarch64-*": {
             "arch": "aarch64",
             "distri": "fedora",
             "flavor": "Workstation-raw_xz-raw.xz",
-            "settings": {
-                "DEPLOY_UPLOAD_TEST": "install_arm_image_deployment_upload",
-                "DESKTOP": "gnome",
-                "TEST_TARGET": "HDD_2"
-            },
             "version": "*"
         },
         "fedora-Workstation-upgrade-aarch64-*": {
             "arch": "aarch64",
             "distri": "fedora",
             "flavor": "Workstation-upgrade",
-            "settings": {
-                "DEPLOY_UPLOAD_TEST": "upgrade_desktop",
-                "DESKTOP": "gnome",
-                "TEST_TARGET": "COMPOSE"
-            },
             "version": "*"
         },
         "fedora-universal-aarch64-*": {
             "arch": "aarch64",
             "distri": "fedora",
             "flavor": "universal",
-            "settings": {
-                "TEST_TARGET": "COMPOSE"
-            },
             "version": "*"
         },
         "fedora-universal-ppc64le-*": {
             "arch": "ppc64le",
             "distri": "fedora",
             "flavor": "universal",
-            "settings": {
-                "TEST_TARGET": "COMPOSE"
-            },
             "version": "*"
         },
         "fedora-universal-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "universal",
-            "settings": {
-                "TEST_TARGET": "COMPOSE"
-            },
             "version": "*"
         },
         "fedora-seasonal-aarch64-*": {
             "arch": "aarch64",
             "distri": "fedora",
             "flavor": "seasonal",
-            "settings": {
-                "TEST_TARGET": "ISO"
-            },
             "version": "*"
         },
         "fedora-seasonal-ppc64le-*": {
             "arch": "ppc64le",
             "distri": "fedora",
             "flavor": "seasonal",
-            "settings": {
-                "TEST_TARGET": "ISO"
-            },
             "version": "*"
         },
         "fedora-seasonal-x86_64-*": {
             "arch": "x86_64",
             "distri": "fedora",
             "flavor": "seasonal",
-            "settings": {
-                "TEST_TARGET": "ISO"
-            },
             "version": "*"
         }
     },