diff --git a/firmware/config/boards/common_make.sh b/firmware/config/boards/common_make.sh
index 47129eaf15..4d29f0d7f1 100644
--- a/firmware/config/boards/common_make.sh
+++ b/firmware/config/boards/common_make.sh
@@ -22,29 +22,42 @@ fi
 chmod u+x $HEX2DFU
 
 mkdir -p deliver
+rm -f deliver/*
 
-rm -f deliver/rusefi.dfu
 echo "$SCRIPT_NAME: invoking hex2dfu for RusEFI"
-$HEX2DFU -i build/rusefi.hex -C 0x1C -o deliver/rusefi.dfu
+$HEX2DFU -i build/rusefi.hex -C 0x1C -o build/rusefi.dfu
 
-# rusEFI console does not use .hex files but for Cypress that's the primary binary format
-cp build/rusefi.hex deliver/
-cp build/rusefi.bin deliver/
-cp build/rusefi.srec deliver/
-
-# bootloader
 if [ $USE_OPENBLT = "yes" ]; then
-  rm -f deliver/openblt_$PROJECT_BOARD.dfu
-  echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT"
-  $HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -o deliver/openblt_$PROJECT_BOARD.dfu
+  # this image is suitable for update through bootloader only
+  # do not deliver update images in any format that can confuse users
+  #cp build/rusefi.bin  deliver/rusefi_update.bin
+  #cp build/rusefi.dfu  deliver/rusefi_update.dfu
+  #cp build/rusefi.hex  deliver/rusefi_update.hex
+  # srec is the only format used by OpenBLT host tools
+  cp build/rusefi.srec deliver/rusefi_update.srec
+else
+  # standalone images (for use with no bootloader)
+  cp build/rusefi.bin  deliver/
+  cp build/rusefi.dfu  deliver/
+  # rusEFI console does not use .hex files but for Cypress that's the primary binary format
+  cp build/rusefi.hex  deliver/
+fi
 
-  cp build-openblt/openblt_$PROJECT_BOARD.hex deliver/
-  cp build-openblt/openblt_$PROJECT_BOARD.bin deliver/
-  cp build-openblt/openblt_$PROJECT_BOARD.srec deliver/
+# bootloader and composite image
+if [ $USE_OPENBLT = "yes" ]; then
+  rm -f deliver/openblt.dfu
+  echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT"
+  $HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -o build-openblt/openblt_$PROJECT_BOARD.dfu
+
+  # do we need all these formats?
+  cp build-openblt/openblt_$PROJECT_BOARD.bin  deliver/openblt.bin
+  cp build-openblt/openblt_$PROJECT_BOARD.dfu  deliver/openblt.dfu
+  #cp build-openblt/openblt_$PROJECT_BOARD.hex  deliver/openblt.hex
 
   rm -f deliver/rusefi_openblt.dfu
   echo "$SCRIPT_NAME: invoking hex2dfu for composite RusEFI+OpenBLT image"
-  $HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -i build/rusefi.hex -C 0x1C -o deliver/rusefi_openblt.dfu
+  $HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -i build/rusefi.hex -C 0x1C -o deliver/rusefi.dfu -b deliver/rusefi.bin
+  #todo: how to create 'signed' hex and srec? Do we need?
 fi
 
 echo "$SCRIPT_NAME: build folder content:"
diff --git a/misc/encedo_hex2dfu/hex2dfu.bin b/misc/encedo_hex2dfu/hex2dfu.bin
index b5a4e11193..484737fd03 100755
Binary files a/misc/encedo_hex2dfu/hex2dfu.bin and b/misc/encedo_hex2dfu/hex2dfu.bin differ
diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh
index 891c71653d..79f2c3eb0d 100644
--- a/misc/jenkins/build_working_folder.sh
+++ b/misc/jenkins/build_working_folder.sh
@@ -82,6 +82,12 @@ cp firmware/deliver/rusefi.dfu $FOLDER
 # just for now - DFU work in progress
 cp firmware/deliver/rusefi.hex $FOLDER
 
+# bootloader
+[ -e firmware/deliver/openblt.bin ] && { cp firmware/deliver/openblt.bin $FOLDER ; }
+[ -e firmware/deliver/openblt.dfu ] && { cp firmware/deliver/openblt.dfu $FOLDER ; }
+# update srec
+[ -e firmware/deliver/rusefi_update.srec ] && { cp firmware/deliver/rusefi_update.srec $FOLDER ; }
+
 if [ -n "$BUNDLE_NAME" ]; then
     mv $FOLDER/rusefi.dfu $FOLDER/rusefi_$BUNDLE_NAME.dfu
 fi