diff --git a/templates.fif.json b/templates.fif.json
index b0384f13..55a9764d 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -343,7 +343,7 @@
             "distri": "fedora",
             "flavor": "universal",
             "settings": {
-                "TEST_TARGET": "ISO"
+                "TEST_TARGET": "COMPOSE"
             },
             "version": "*"
         },
@@ -352,7 +352,7 @@
             "distri": "fedora",
             "flavor": "universal",
             "settings": {
-                "TEST_TARGET": "ISO"
+                "TEST_TARGET": "COMPOSE"
             },
             "version": "*"
         },
@@ -361,7 +361,7 @@
             "distri": "fedora",
             "flavor": "universal",
             "settings": {
-                "TEST_TARGET": "ISO"
+                "TEST_TARGET": "COMPOSE"
             },
             "version": "*"
         }
@@ -733,9 +733,9 @@
         },
         "install_blivet_resize_lvm": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "PARTITIONING": "custom_blivet_resize_lvm",
@@ -746,9 +746,9 @@
         },
         "install_resize_lvm": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "PARTITIONING": "custom_resize_lvm",
@@ -838,9 +838,9 @@
         },
         "install_anaconda_text": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "ANACONDA_TEXT": "1"
@@ -848,9 +848,9 @@
         },
         "install_arabic_language": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "DESKTOP": "gnome",
@@ -882,9 +882,9 @@
         },
         "install_asian_language": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "DESKTOP": "gnome",
@@ -902,10 +902,10 @@
         },
         "install_blivet_btrfs": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40,
-                "fedora-universal-x86_64-*-uefi": 41
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
                 "PARTITIONING": "custom_blivet_btrfs",
@@ -915,10 +915,10 @@
         },
         "install_blivet_lvmthin": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40,
-                "fedora-universal-x86_64-*-uefi": 41
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
                 "PARTITIONING": "custom_blivet_lvmthin",
@@ -928,10 +928,10 @@
         },
         "install_blivet_with_swap": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 50,
-                "fedora-universal-ppc64le-*-ppc64le": 50,
-                "fedora-universal-x86_64-*-64bit": 50,
-                "fedora-universal-x86_64-*-uefi": 51
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 50,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 50,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 50,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 51
             },
             "settings": {
                 "PARTITIONING": "custom_blivet_with_swap",
@@ -941,10 +941,10 @@
         },
         "install_blivet_software_raid": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40,
-                "fedora-universal-x86_64-*-uefi": 41
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
                 "NUMDISKS": "2",
@@ -955,10 +955,10 @@
         },
         "install_blivet_xfs": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40,
-                "fedora-universal-x86_64-*-uefi": 41
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
                 "PARTITIONING": "custom_blivet_xfs",
@@ -968,10 +968,10 @@
         },
         "install_btrfs": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40,
-                "fedora-universal-x86_64-*-uefi": 41
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
                 "PARTITIONING": "custom_btrfs",
@@ -980,9 +980,9 @@
         },
         "install_cyrillic_language": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "DESKTOP": "gnome",
@@ -1040,10 +1040,10 @@
         },
         "install_delete_partial": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30,
-                "fedora-universal-x86_64-*-uefi": 31
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
                 "HDD_1": "disk_full_%PART_TABLE_TYPE%.img",
@@ -1053,8 +1053,8 @@
         },
         "install_delete_pata": {
             "profiles": {
-                "fedora-universal-x86_64-*-64bit": 20,
-                "fedora-universal-x86_64-*-uefi": 21
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 21
             },
             "settings": {
                 "HDDMODEL": "ide-hd",
@@ -1064,9 +1064,9 @@
         },
         "install_european_language": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "DESKTOP": "gnome",
@@ -1084,9 +1084,9 @@
         },
         "install_iscsi": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "ANACONDA_STATIC": "172.16.2.111",
@@ -1100,9 +1100,9 @@
         },
         "install_kickstart_firewall_configured": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "GRUB": "inst.ks=http://fedorapeople.org/groups/qa/kickstarts/firewall-configured-net.ks",
@@ -1114,9 +1114,9 @@
         },
         "install_kickstart_firewall_disabled": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "GRUB": "inst.ks=http://fedorapeople.org/groups/qa/kickstarts/firewall-disabled-net.ks",
@@ -1128,9 +1128,9 @@
         },
         "install_kickstart_hdd": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30
             },
             "settings": {
                 "GRUB": "inst.ks=hd:vdb1:/root-user-crypted-net.ks",
@@ -1144,9 +1144,9 @@
         },
         "install_kickstart_nfs": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30
             },
             "settings": {
                 "GRUB": "inst.ks=nfs:172.16.2.110:/export/root-user-crypted-net.ks",
@@ -1161,9 +1161,9 @@
         },
         "install_kickstart_user_creation": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "GRUB": "inst.ks=http://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks",
@@ -1175,10 +1175,10 @@
         },
         "install_lvmthin": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40,
-                "fedora-universal-x86_64-*-uefi": 41
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
                 "PARTITIONING": "custom_lvmthin",
@@ -1187,9 +1187,9 @@
         },
         "install_mirrorlist_graphical": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "MIRRORLIST_GRAPHICAL": "1"
@@ -1197,10 +1197,10 @@
         },
         "install_multi": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20,
-                "fedora-universal-x86_64-*-uefi": 21
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 21
             },
             "settings": {
                 "HDD_2": "disk_full_mbr.img",
@@ -1211,10 +1211,10 @@
         },
         "install_multi_empty": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30,
-                "fedora-universal-x86_64-*-uefi": 31
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
                 "NUMDISKS": "2",
@@ -1224,10 +1224,10 @@
         },
         "install_with_swap": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 50,
-                "fedora-universal-ppc64le-*-ppc64le": 50,
-                "fedora-universal-x86_64-*-64bit": 50,
-                "fedora-universal-x86_64-*-uefi": 51
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 50,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 50,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 50,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 51
             },
             "settings": {
                 "PARTITIONING": "custom_with_swap",
@@ -1244,8 +1244,8 @@
         },
         "install_package_set_kde": {
             "profiles": {
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 50
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 50
             },
             "settings": {
                 "DESKTOP": "kde",
@@ -1257,9 +1257,9 @@
         },
         "install_package_set_minimal": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30
             },
             "settings": {
                 "PACKAGE_SET": "minimal",
@@ -1268,10 +1268,10 @@
         },
         "install_pxeboot": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30,
-                "fedora-universal-x86_64-*-uefi": 31
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
                 "+ISO": "",
@@ -1301,9 +1301,9 @@
         },
         "install_repository_http_graphical": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "REPOSITORY_GRAPHICAL": "%LOCATION%"
@@ -1311,9 +1311,9 @@
         },
         "install_repository_http_variation": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "REPOSITORY_VARIATION": "%LOCATION%"
@@ -1363,10 +1363,10 @@
         },
         "install_rescue_encrypted": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 31,
-                "fedora-universal-ppc64le-*-ppc64le": 31,
-                "fedora-universal-x86_64-*-64bit": 31,
-                "fedora-universal-x86_64-*-uefi": 32
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 31,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 31,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 31,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 32
             },
             "settings": {
                 "BOOTFROM": "d",
@@ -1377,8 +1377,8 @@
         },
         "install_sata": {
             "profiles": {
-                "fedora-universal-x86_64-*-64bit": 20,
-                "fedora-universal-x86_64-*-uefi": 21
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 21
             },
             "settings": {
                 "ATACONTROLLER": "ich9-ahci",
@@ -1387,9 +1387,9 @@
         },
         "install_scsi_updates_img": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 20,
-                "fedora-universal-ppc64le-*-ppc64le": 20,
-                "fedora-universal-x86_64-*-64bit": 20
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 20,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 20,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 20
             },
             "settings": {
                 "CDMODEL": "scsi-cd",
@@ -1401,9 +1401,9 @@
         },
         "install_serial_console": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30
             },
             "settings": {
                 "ANACONDA_TEXT": "1",
@@ -1414,9 +1414,9 @@
         },
         "install_shrink_ext4": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "HDD_1": "disk_shrink_ext4.img",
@@ -1426,9 +1426,9 @@
         },
         "install_shrink_ntfs": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "HDD_1": "disk_shrink_ntfs.img",
@@ -1438,10 +1438,10 @@
         },
         "install_simple_encrypted": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30,
-                "fedora-universal-x86_64-*-uefi": 31
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
                 "ENCRYPT_PASSWORD": "weakpassword",
@@ -1450,10 +1450,10 @@
         },
         "install_simple_free_space": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30,
-                "fedora-universal-x86_64-*-uefi": 31
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
                 "HDD_1": "disk_freespace_%PART_TABLE_TYPE%.img",
@@ -1463,10 +1463,10 @@
         },
         "install_software_raid": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 30,
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 30,
-                "fedora-universal-x86_64-*-uefi": 31
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
                 "NUMDISKS": "2",
@@ -1476,8 +1476,8 @@
         },
         "install_updates_img_local": {
             "profiles": {
-                "fedora-universal-ppc64le-*-ppc64le": 30,
-                "fedora-universal-x86_64-*-64bit": 40
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
                 "GRUB": "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img",
@@ -1567,10 +1567,10 @@
         },
         "install_xfs": {
             "profiles": {
-                "fedora-universal-aarch64-*-aarch64": 40,
-                "fedora-universal-ppc64le-*-ppc64le": 40,
-                "fedora-universal-x86_64-*-64bit": 40,
-                "fedora-universal-x86_64-*-uefi": 41
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 40,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 40,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 40,
+                "fedora-Server-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
                 "PARTITIONING": "custom_xfs",
@@ -2079,10 +2079,7 @@
             "profiles": {
                 "fedora-Server-dvd-iso-aarch64-*-aarch64": 10,
                 "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 10,
-                "fedora-Server-dvd-iso-x86_64-*-64bit": 10,
-                "fedora-universal-aarch64-*-aarch64": 10,
-                "fedora-universal-ppc64le-*-ppc64le": 10,
-                "fedora-universal-x86_64-*-64bit": 10
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 10
             },
             "settings": {
                 "BOOTFROM": "c",
@@ -2107,7 +2104,6 @@
                 "DESKTOP": "gnome",
                 "HDD_1": "disk_f%UP2REL%_desktop_4_x86_64.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2123,7 +2119,6 @@
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "HDD_1": "disk_f%UP2REL%_desktopencrypt_x86_64.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2138,7 +2133,6 @@
                 "DESKTOP": "kde",
                 "HDD_1": "disk_f%UP2REL%_kde_4_x86_64.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2154,7 +2148,6 @@
                 "BOOTFROM": "c",
                 "HDD_1": "disk_f%UP2REL%_minimal_3_%ARCH%.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false"
             }
@@ -2167,7 +2160,6 @@
                 "BOOTFROM": "c",
                 "HDD_1": "disk_f%UP2REL%_minimal-uefi_3_%ARCH%.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false"
             }
@@ -2186,7 +2178,6 @@
                 "POST_STATIC": "172.16.2.103 client003.domain.local",
                 "PREUPGRADE": "realmd_join_sssd",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false",
                 "WORKER_CLASS": "tap"
@@ -2202,7 +2193,6 @@
                 "BOOTFROM": "c",
                 "HDD_1": "disk_f%UP2REL%_server_3_%ARCH%.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2222,7 +2212,6 @@
                 "POST_STATIC": "172.16.2.100 ipa001.domain.local",
                 "PREUPGRADE": "role_deploy_domain_controller",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false",
                 "WORKER_CLASS": "tap"
@@ -2237,7 +2226,6 @@
                 "DESKTOP": "gnome",
                 "HDD_1": "disk_f%UP1REL%_desktop_4_x86_64.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2253,7 +2241,6 @@
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "HDD_1": "disk_f%UP1REL%_desktopencrypt_x86_64.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2268,7 +2255,6 @@
                 "BOOTFROM": "c",
                 "DESKTOP": "kde",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2284,7 +2270,6 @@
                 "BOOTFROM": "c",
                 "HDD_1": "disk_f%UP1REL%_minimal_3_%ARCH%.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false"
             }
@@ -2297,7 +2282,6 @@
                 "BOOTFROM": "c",
                 "HDD_1": "disk_f%UP1REL%_minimal-uefi_3_%ARCH%.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false"
             }
@@ -2317,7 +2301,6 @@
                 "POST_STATIC": "172.16.2.103 client003.domain.local",
                 "PREUPGRADE": "realmd_join_sssd",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false",
                 "WORKER_CLASS": "tap"
@@ -2333,7 +2316,6 @@
                 "BOOTFROM": "c",
                 "HDD_1": "disk_f%UP1REL%_server_3_%ARCH%.img",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "test",
                 "USER_PASSWORD": "weakpassword"
@@ -2354,7 +2336,6 @@
                 "POST_STATIC": "172.16.2.100 ipa001.domain.local",
                 "PREUPGRADE": "role_deploy_domain_controller",
                 "ROOT_PASSWORD": "weakpassword",
-                "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
                 "USER_LOGIN": "false",
                 "WORKER_CLASS": "tap"