diff --git a/templates.fif.json b/templates.fif.json
index c4baee5a..55d8f326 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1105,15 +1105,14 @@
             "settings": {
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
-                "HDD_2": "disk_usb.qcow2",
-                "HDDMODEL_2": "usb-storage,bus=xhci.0,removable=on",
-                "NUMDISKS": "2",
-                "QEMU_APPEND": "-device qemu-xhci,id=xhci",
+                "NUMDISKS": "1",
+                "QEMU_APPEND": "-blockdev driver=file,node-name=usb-overlay-file,filename=tmp/usb-overlay.qcow2,cache.no-flush=on -blockdev driver=qcow2,node-name=usb-overlay,file=usb-overlay-file,backing.driver=raw,backing.file.filename=/var/lib/openqa/share/factory/hdd/fixed/disk_usb.img -device usb-storage,bus=xhci.0,drive=usb-overlay,removable=on",
                 "HDDSIZEGB": "20",
                 "POSTINSTALL_PATH": "tests/applications/media-writer",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%",
                 "MEDIA": "official",
-                "EDITION": "workstation"
+                "EDITION": "workstation",
+		"WORKER_CLASS": "usbtest"
             }
         },
         "nautilus": {