diff --git a/templates.fif.json b/templates.fif.json
index f3fc433c..4b85ca4f 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1500,7 +1500,7 @@
                 "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"
             }
         },
-        "install_usb": {
+        "install_usb_upload": {
             "profile_groups": {
                 "server-dvd-3arch": 10,
                 "coreos-iot-silverblue": 20,
@@ -1513,12 +1513,29 @@
             },
             "settings": {
                 "PACKAGE_SET": "default",
-                "POSTINSTALL": "_collect_data",
-                "RETRY": "%INSTALL_RETRY%",
-                "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "STORE_HDD_1": "usbdisk_%FLAVOR%_%MACHINE%.qcow2",
                 "USBBOOT":"1"
             }
         },
+        "postinstall_usb": {
+            "profile_groups": {
+                "server-dvd-3arch": 10,
+                "coreos-iot-silverblue": 20,
+                "workstation-lives": 10
+            },
+            "profiles": {
+                "fedora-BaseOS-dvd-iso-x86_64-*-64bit": 50,
+                "fedora-KDE-live-iso-x86_64-*-64bit": 15,
+                "fedora-i3-live-x86_64-*-64bit": 70
+            },
+            "settings": {
+                "ENTRY_POINT": "_graphical_wait_login _collect_data uefi_postinstall _console_shutdown",
+                "PACKAGE_SET": "default",
+                "START_AFTER_TEST":"install_usb_upload",
+                "HDD_1": "usbdisk_%FLAVOR%_%MACHINE%.qcow2",
+                "USBBOOT":"0"
+            }
+        },
         "install_delete_partial": {
             "profile_groups": {
                 "server-dvd-4arch": 30