diff --git a/board/bananapi/postscript.sh b/board/bananapi/postscript.sh
index 9c46b9aa1b..57228f0501 100755
--- a/board/bananapi/postscript.sh
+++ b/board/bananapi/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 UBOOT_HOST_DIR=$TARGET/../build/host-uboot-tools-*
 
 cp $IMG_DIR/uImage $BOOT_DIR
diff --git a/board/common/postscript.sh b/board/common/postscript.sh
index a24f1d9e90..bc54ee45c9 100755
--- a/board/common/postscript.sh
+++ b/board/common/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 export TARGET="$1"
 export BOARD=$(basename $(dirname $TARGET))
 export COMMON_DIR=$(dirname $0)
@@ -9,7 +11,9 @@ export IMG_DIR=$TARGET/../images
 
 mkdir -p $BOOT_DIR
 
-test -x $BOARD_DIR/postscript.sh && $BOARD_DIR/postscript.sh
+if [ -x $BOARD_DIR/postscript.sh ]; then
+    $BOARD_DIR/postscript.sh
+fi
 
 # transform /var contents as needed
 rm -rf $TARGET/var/cache
@@ -30,7 +34,9 @@ ln -s /tmp $TARGET/var/tmp
 
 # cleanups
 $COMMON_DIR/cleanups.sh
-test -x $BOARD_DIR/cleanups.sh && test -x $BOARD_DIR/cleanups.sh || true
+if [ -x $BOARD_DIR/cleanups.sh ]; then
+    $BOARD_DIR/cleanups.sh
+fi
 
 # board-specific os.conf
 if [ -r $BOARD_DIR/os.conf ]; then
diff --git a/board/nanopineo2/postscript.sh b/board/nanopineo2/postscript.sh
index 4861a24812..c86407b13e 100755
--- a/board/nanopineo2/postscript.sh
+++ b/board/nanopineo2/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
 
diff --git a/board/odroidc1/postscript.sh b/board/odroidc1/postscript.sh
index aeac335477..ccf44bb4e0 100755
--- a/board/odroidc1/postscript.sh
+++ b/board/odroidc1/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR
 
diff --git a/board/odroidc2/postscript.sh b/board/odroidc2/postscript.sh
index 2f2bd36d2e..0296849600 100755
--- a/board/odroidc2/postscript.sh
+++ b/board/odroidc2/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR
 
diff --git a/board/odroidxu4/postscript.sh b/board/odroidxu4/postscript.sh
index fb66999494..1a965ae5c8 100755
--- a/board/odroidxu4/postscript.sh
+++ b/board/odroidxu4/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR
 
diff --git a/board/orangepione/postscript.sh b/board/orangepione/postscript.sh
index 54b02911f4..6b2bf27881 100755
--- a/board/orangepione/postscript.sh
+++ b/board/orangepione/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
 $HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr
 
diff --git a/board/pine64/postscript.sh b/board/pine64/postscript.sh
index 284948746c..5e8cc683d1 100755
--- a/board/pine64/postscript.sh
+++ b/board/pine64/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # boot directory
 mkdir -p $BOOT_DIR/pine64
 
diff --git a/board/raspberrypi/postscript.sh b/board/raspberrypi/postscript.sh
index 7b0b4b28b4..31683c5e03 100755
--- a/board/raspberrypi/postscript.sh
+++ b/board/raspberrypi/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 RPI_FW_DIR=$TARGET/../images/rpi-firmware
 
 cp $BOARD_DIR/config.txt $BOOT_DIR
diff --git a/board/raspberrypi2/postscript.sh b/board/raspberrypi2/postscript.sh
index eccf760684..bb556320bd 100755
--- a/board/raspberrypi2/postscript.sh
+++ b/board/raspberrypi2/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 RPI_FW_DIR=$TARGET/../images/rpi-firmware
 
 cp $BOARD_DIR/config.txt $BOOT_DIR
diff --git a/board/raspberrypi3/postscript.sh b/board/raspberrypi3/postscript.sh
index c76bfb264c..df98ae0de2 100755
--- a/board/raspberrypi3/postscript.sh
+++ b/board/raspberrypi3/postscript.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 RPI_FW_DIR=$TARGET/../images/rpi-firmware
 
 cp $BOARD_DIR/config.txt $BOOT_DIR
@@ -7,6 +9,8 @@ cp $BOARD_DIR/cmdline.txt $BOOT_DIR
 cp $BOARD_DIR/fwupdater.gz $BOOT_DIR
 cp $IMG_DIR/zImage $BOOT_DIR/kernel.img
 cp $IMG_DIR/bcm2710-rpi-3-b.dtb $BOOT_DIR
+cp $IMG_DIR/bcm2710-rpi-3-b-plus.dtb $BOOT_DIR
+cp $IMG_DIR/bcm2710-rpi-cm3.dtb $BOOT_DIR
 cp $RPI_FW_DIR/bootcode.bin $BOOT_DIR
 cp $RPI_FW_DIR/start.elf $BOOT_DIR
 cp $RPI_FW_DIR/fixup.dat $BOOT_DIR