diff --git a/templates.fif.json b/templates.fif.json
index e3d0758c..626ec815 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -420,7 +420,9 @@
                 "NUMDISKS": "2",
                 "PARTITIONING": "custom_gui_software_raid",
                 "POSTINSTALL": "disk_custom_software_raid_postinstall",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_custom_gui_xfs": {
@@ -432,7 +434,9 @@
             "settings": {
                 "PARTITIONING": "custom_gui_xfs",
                 "POSTINSTALL": "disk_custom_xfs_postinstall",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_cyrillic_language": {
@@ -509,7 +513,9 @@
             "settings": {
                 "HDD_1": "disk_full_%PART_TABLE_TYPE%.img",
                 "PARTITIONING": "guided_delete_partial",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_delete_pata": {
@@ -522,7 +528,9 @@
                 "HDDMODEL": "ide-hd",
                 "HDD_1": "disk_full_mbr.img",
                 "HDDSIZEGB": "20",
-                "PARTITIONING": "guided_delete_all"
+                "PARTITIONING": "guided_delete_all",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_european_language": {
@@ -551,7 +559,9 @@
             },
             "settings": {
                 "PARTITIONING": "custom_lvmthin",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_lvm_ext4": {
@@ -596,7 +606,9 @@
                 "HDD_2": "disk_full_mbr.img",
                 "NUMDISKS": "2",
                 "PARTITIONING": "guided_multi",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_multi_empty": {
@@ -608,7 +620,9 @@
             "settings": {
                 "NUMDISKS": "2",
                 "PARTITIONING": "guided_multi_empty_all",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_with_swap": {
@@ -619,7 +633,9 @@
             },
             "settings": {
                 "PARTITIONING": "custom_with_swap",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_package_set_minimal": {
@@ -692,7 +708,9 @@
                 "rocky-universal-x86_64-*-64bit": 20
             },
             "settings": {
-                "REPOSITORY_GRAPHICAL": "%LOCATION%"
+                "REPOSITORY_GRAPHICAL": "%LOCATION%",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_repository_http_variation": {
@@ -701,7 +719,9 @@
                 "rocky-universal-x86_64-*-64bit": 20
             },
             "settings": {
-                "REPOSITORY_VARIATION": "%LOCATION%"
+                "REPOSITORY_VARIATION": "%LOCATION%",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_rescue_encrypted": {
@@ -725,7 +745,9 @@
             },
             "settings": {
                 "ATACONTROLLER": "ich9-ahci",
-                "HDDMODEL": "ide-hd,bus=ahci0.0"
+                "HDDMODEL": "ide-hd,bus=ahci0.0",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_scsi_updates_img": {
@@ -738,7 +760,9 @@
                 "GRUB": "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-openqa.img",
                 "HDDMODEL": "scsi-hd",
                 "SCSICONTROLLER": "virtio-scsi-pci",
-                "TEST_UPDATES": "1"
+                "TEST_UPDATES": "1",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_serial_console": {
@@ -761,7 +785,9 @@
             "settings": {
                 "HDD_1": "disk_shrink_ext4.img",
                 "PARTITIONING": "guided_shrink",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_shrink_ntfs": {
@@ -772,7 +798,9 @@
             "settings": {
                 "HDD_1": "disk_shrink_ntfs.img",
                 "PARTITIONING": "guided_shrink",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_simple_encrypted": {
@@ -783,7 +811,9 @@
             },
             "settings": {
                 "ENCRYPT_PASSWORD": "weakpassword",
-                "STORE_HDD_1": "disk_%MACHINE%_encrypted.qcow2"
+                "STORE_HDD_1": "disk_%MACHINE%_encrypted.qcow2",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_simple_free_space": {
@@ -796,7 +826,9 @@
                 "HDD_1": "disk_freespace_%PART_TABLE_TYPE%.img",
                 "HDDSIZEGB": "20",
                 "PARTITIONING": "guided_free_space",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_software_raid": {
@@ -808,7 +840,9 @@
             "settings": {
                 "NUMDISKS": "2",
                 "PARTITIONING": "custom_software_raid",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "install_xfs": {
@@ -819,7 +853,9 @@
             },
             "settings": {
                 "PARTITIONING": "custom_xfs",
-                "ROOT_PASSWORD": "weakpassword"
+                "ROOT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "minimal",
+                "DESKTOP": "false"
             }
         },
         "memtest": {