diff --git a/.github/workflows/hw-ci/build_for_hw_ci.sh b/.github/workflows/hw-ci/build_for_hw_ci.sh
index 6b9753750d..d91a217534 100755
--- a/.github/workflows/hw-ci/build_for_hw_ci.sh
+++ b/.github/workflows/hw-ci/build_for_hw_ci.sh
@@ -7,7 +7,8 @@ HW_TARGET=$2
 # .github/workflows/hw-ci/build_for_hw_ci.sh config/boards/f407-discovery f407-discovery
 # .github/workflows/hw-ci/build_for_hw_ci.sh config/boards/proteus        proteus_f4
 
-set -e
+set -euo pipefail
+
 echo "HW CI build [$HW_FOLDER][$HW_TARGET]"
 
 cd firmware
diff --git a/.github/workflows/hw-ci/run_hw_ci.sh b/.github/workflows/hw-ci/run_hw_ci.sh
index 737ab19f51..ccef11ca52 100755
--- a/.github/workflows/hw-ci/run_hw_ci.sh
+++ b/.github/workflows/hw-ci/run_hw_ci.sh
@@ -5,7 +5,7 @@
 
 HW_SUITE=$1
 
-set -e
+set -euo pipefail
 
 cd java_tools
 ./gradlew :autotest:shadowJar
diff --git a/firmware/config/boards/common_make.sh b/firmware/config/boards/common_make.sh
index 3f3fb19987..4c4a3f7fc6 100755
--- a/firmware/config/boards/common_make.sh
+++ b/firmware/config/boards/common_make.sh
@@ -4,7 +4,7 @@ PROJECT_BOARD=$1
 PROJECT_CPU=$2
 
 # fail on error
-set -e
+set -euo pipefail
 
 SCRIPT_NAME="common_make.sh"
 echo "Entering $SCRIPT_NAME with board $1 and CPU $2"
diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index f1d08b8b34..4026192970 100755
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -5,7 +5,7 @@
 #                 or ./gen_config_board.sh hellen/hellen128 hellen128
 # which is short for ./gen_config_board.sh hellen/hellen128 hellen128 rusefi_hellen128.ini
 
-set -e
+set -euo pipefail
 
 echo "This script reads rusefi_config.txt and produces firmware persistent configuration headers"
 echo "the storage section of rusefiXXX.ini is updated as well"
diff --git a/firmware/hw_layer/mass_storage/create_ini_image.sh b/firmware/hw_layer/mass_storage/create_ini_image.sh
index ec5462a524..5b69da860c 100755
--- a/firmware/hw_layer/mass_storage/create_ini_image.sh
+++ b/firmware/hw_layer/mass_storage/create_ini_image.sh
@@ -4,7 +4,7 @@
 # hw_layer/mass_storage/create_ini_image.sh tunerstudio/generated/rusefi.ini hw_layer/mass_storage/ramdisk_image.h  112 test https://rusefi.com/s/test
 
 # fail on error
-set -e
+set -euo pipefail
 
 if [ "$(expr substr $(uname -s) 1 6)" == "CYGWIN" ] || [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
   echo No image on $(uname -s)
diff --git a/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh b/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh
index f5b5c7b2e8..46553d8939 100755
--- a/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh
+++ b/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh
@@ -4,7 +4,7 @@
 # hw_layer/mass_storage/create_ini_image_compressed.sh tunerstudio/generated/rusefi.ini hw_layer/mass_storage/ramdisk_image.h  1024 test https://rusefi.com/s/test
 
 # fail on error
-set -e
+set -euo pipefail
 
 if [ "$(expr substr $(uname -s) 1 6)" == "CYGWIN" ] || [ "$(expr substr $(uname -s) 1 5)" == "MINGW" ]; then
   echo No image on $(uname -s)
diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh
index 4eee3aedbc..21cb8b198c 100755
--- a/misc/jenkins/build_working_folder.sh
+++ b/misc/jenkins/build_working_folder.sh
@@ -4,6 +4,8 @@
 # file build_working_folder.sh
 #
 
+set -euo pipefail
+
 FULL_BUNDLE_FILE="${BUNDLE_FULL_NAME}.zip"
 
 echo "${BUNDLE_FULL_NAME}: Packaging temp/$FULL_BUNDLE_FILE file"
@@ -62,8 +64,6 @@ RUSEFI_CONSOLE_SETTINGS=""
 cp -r misc/install/STM32_Programmer_CLI $CONSOLE_FOLDER
 
 cp firmware/deliver/fome.bin $FOLDER
-# just for now - DFU work in progress
-cp firmware/deliver/fome.hex $FOLDER
 
 # bootloader
 [ -e firmware/deliver/fome_bl.bin ] && { cp firmware/deliver/fome_bl.bin $FOLDER ; }
diff --git a/misc/jenkins/compile_other_versions/compile.sh b/misc/jenkins/compile_other_versions/compile.sh
index dada35d01c..07cd80e028 100755
--- a/misc/jenkins/compile_other_versions/compile.sh
+++ b/misc/jenkins/compile_other_versions/compile.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # fail on error!
-set -e
+set -euo pipefail
 
 # for example 'config/boards/proteus'
 BOARD_DIR="$1"
diff --git a/simulator/compile.sh b/simulator/compile.sh
index 0eb521b065..3a3d46a8f7 100755
--- a/simulator/compile.sh
+++ b/simulator/compile.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -euo pipefail
 
 rm -f build/fome_simulator.exe
 make -j8 -r $@
diff --git a/unit_tests/run_sharded_tests.sh b/unit_tests/run_sharded_tests.sh
index cfccf9a2f6..8b9fa94e59 100755
--- a/unit_tests/run_sharded_tests.sh
+++ b/unit_tests/run_sharded_tests.sh
@@ -3,7 +3,7 @@
 # This script runs every test in its own process (own invocation of fome_test executable)
 # This allows us to test for accidental cross-test leakage that fixes/breaks something
 
-set -e
+set -euo pipefail
 
 export GTEST_TOTAL_SHARDS=600
 for IDX in {0..599}