diff --git a/.github/workflows/create_nightly_release.yml b/.github/workflows/create_nightly_release.yml
index 64cf8938..4ed96367 100644
--- a/.github/workflows/create_nightly_release.yml
+++ b/.github/workflows/create_nightly_release.yml
@@ -61,6 +61,9 @@ jobs:
       - name: Unzip world map
         run: |
           unzip world_map.zip -d sdcard/ADSB
+      - name: Prepare Firmware ZIP
+        run: |
+          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
       - name: Create Firmware ZIP
         run: |
           zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
diff --git a/.github/workflows/create_stable_release.yml b/.github/workflows/create_stable_release.yml
index 44085c19..c6284380 100644
--- a/.github/workflows/create_stable_release.yml
+++ b/.github/workflows/create_stable_release.yml
@@ -45,6 +45,9 @@ jobs:
       - name: Unzip world map
         run: |
           unzip world_map.zip -d sdcard/ADSB
+      - name: Prepare Firmware ZIP
+        run: |
+          cp build/hackrf/firmware/hackrf_usb/hackrf_usb.dfu flashing/utils/hackrf_one_usb.dfu && cp build/hackrf/firmware/hackrf_usb/hackrf_usb.bin flashing/utils/hackrf_one_usb.bin
       - name: Create Firmware ZIP
         run: |
           zip -j firmware.zip build/firmware/portapack-mayhem-firmware.bin && cd flashing && zip -r ../firmware.zip *
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89e3f485..3aff31c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,7 @@ add_subdirectory(hackrf/firmware)
 
 set(HACKRF_FIRMWARE_DFU_FILENAME hackrf_usb.dfu)
 set(HACKRF_FIRMWARE_BIN_FILENAME hackrf_usb_ram.bin)
+set(HACKRF_FIRMWARE_FILENAME hackrf_usb.bin)
 set(HACKRF_CPLD_XSVF_FILENAME default.xsvf)
 
 set(HACKRF_PATH ${CMAKE_CURRENT_LIST_DIR}/hackrf)
diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt
index 1042f2da..bc613db1 100644
--- a/firmware/CMakeLists.txt
+++ b/firmware/CMakeLists.txt
@@ -64,7 +64,7 @@ add_custom_command(
 
 add_custom_target(
 	firmware
-	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME}
+	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME} ${HACKRF_FIRMWARE_FILENAME}
 )
 
 if(${GCC_VERSION_MISMATCH})
diff --git a/flashing/utils/hackrf_one_usb.bin b/flashing/utils/hackrf_one_usb.bin
deleted file mode 100755
index 00d9ec32..00000000
Binary files a/flashing/utils/hackrf_one_usb.bin and /dev/null differ
diff --git a/flashing/utils/hackrf_one_usb.dfu b/flashing/utils/hackrf_one_usb.dfu
deleted file mode 100644
index e6ccbbde..00000000
Binary files a/flashing/utils/hackrf_one_usb.dfu and /dev/null differ