diff --git a/firmware/gen_config.sh b/firmware/gen_config.sh
index 377fa4f66b..272ca01656 100755
--- a/firmware/gen_config.sh
+++ b/firmware/gen_config.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 echo "This script reads rusefi_config.txt and produces firmware persistent configuration headers"
 echo "The storage section of fome.ini is updated as well"
 
diff --git a/firmware/gen_signature.sh b/firmware/gen_signature.sh
index 8f2a8eaa7e..3fbf7535c1 100755
--- a/firmware/gen_signature.sh
+++ b/firmware/gen_signature.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
-# file gen_signature.sh
+set -euo pipefail
 
 SHORT_BOARDNAME=$1
 
-
 SIGNATURE_FILE_NAME=tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt
 echo "Generating signature for ${SHORT_BOARDNAME}"