diff --git a/firmware/boards/build_f1_board.sh b/firmware/boards/build_f1_board.sh
index b36d425..e9d4c65 100755
--- a/firmware/boards/build_f1_board.sh
+++ b/firmware/boards/build_f1_board.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eo pipefail
 
 if [ ! "$USE_OPENBLT" ]; then
   USE_OPENBLT=no
diff --git a/firmware/boards/f0_module/build_wideband.sh b/firmware/boards/f0_module/build_wideband.sh
index 64c1bb1..9714eaf 100755
--- a/firmware/boards/f0_module/build_wideband.sh
+++ b/firmware/boards/f0_module/build_wideband.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o pipefail
+set -eo pipefail
 
 # first build the bootloader
 cd bootloader