diff --git a/bootloader-docker-build.sh b/bootloader-docker-build.sh
index 636a095aa0..d25e7e0234 100755
--- a/bootloader-docker-build.sh
+++ b/bootloader-docker-build.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 IMAGETAG=trezor-mcu-build
 FIRMWARETAG=${1:-master}
 
diff --git a/firmware-docker-build.sh b/firmware-docker-build.sh
index cd95ac5b7e..2b32c6c7b5 100755
--- a/firmware-docker-build.sh
+++ b/firmware-docker-build.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e
+
 IMAGETAG=trezor-mcu-build
 FIRMWARETAG=${1:-master}
 
diff --git a/firmware-fingerprint.sh b/firmware-fingerprint.sh
index 0157467ccf..3e48bcdb08 100755
--- a/firmware-fingerprint.sh
+++ b/firmware-fingerprint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 if [ -z "$1" ]; then
     echo "Please provide filename as argument"
diff --git a/firmware/u2f/genkeys.sh b/firmware/u2f/genkeys.sh
old mode 100644
new mode 100755
index 3bc7e5b10b..33371d5be9
--- a/firmware/u2f/genkeys.sh
+++ b/firmware/u2f/genkeys.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 cat > u2f_keys.h <<EOF
 #ifndef __U2F_KEYS_H_INCLUDED__
@@ -13,13 +14,13 @@ if [ \! -e trezordevkey.pem ]; then
     openssl ecparam -genkey -out trezordevkey.pem -name prime256v1
 fi
 openssl ec -in trezordevkey.pem -text  |
-    perl -e '$key = "\t"; while (<>) { 
+    perl -e '$key = "\t"; while (<>) {
       if (/priv:/) { $priv = 1 }
       elsif (/pub:/) { $priv = 0 }
       elsif ($priv) {
         while ($_ =~ s/.*?([0-9a-f]{2})//) {
-          $key .= "0x$1,"; 
-          if ($num++ % 8 == 7) { $key .= "\n\t"; } 
+          $key .= "0x$1,";
+          if ($num++ % 8 == 7) { $key .= "\n\t"; }
           else {$key .= " ";}
         }
       }
@@ -32,7 +33,7 @@ cat >> u2f_keys.h <<EOF
 const uint8_t U2F_ATT_CERT[] = {
 EOF
 
-openssl req -new -key trezordevkey.pem -out trezordevcert.req -subj "/CN=Trezor U2F" 
+openssl req -new -key trezordevkey.pem -out trezordevcert.req -subj "/CN=Trezor U2F"
 openssl x509 -req -in trezordevcert.req -signkey trezordevkey.pem -days 3650 -out trezordevcert.pem
 openssl x509 -in trezordevcert.pem -outform der | od -tx1 -w12 -Anone | perl -pe 's/ ([0-9a-f]{2})/ 0x$1,/g; $_ =~ s/^ /\t/;' >> u2f_keys.h