diff --git a/build_scripts/build_linux_deb.sh b/build_scripts/build_linux_deb.sh
index b489d1e70f..b60b6744ac 100644
--- a/build_scripts/build_linux_deb.sh
+++ b/build_scripts/build_linux_deb.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -o errexit
+
 if [ ! "$1" ]; then
   echo "This script requires either amd64 of arm64 as an argument"
 	exit 1
diff --git a/build_scripts/build_linux_rpm.sh b/build_scripts/build_linux_rpm.sh
index 02641e2eb3..e8fa595fc0 100644
--- a/build_scripts/build_linux_rpm.sh
+++ b/build_scripts/build_linux_rpm.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -o errexit
+
 if [ ! "$1" ]; then
   echo "This script requires either amd64 of arm64 as an argument"
 	exit 1
diff --git a/build_scripts/build_macos.sh b/build_scripts/build_macos.sh
index 38758c099f..d1831e285f 100644
--- a/build_scripts/build_macos.sh
+++ b/build_scripts/build_macos.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -euo pipefail
+set -o errexit -o nounset
 
 pip install setuptools_scm
 # The environment variable CHIA_INSTALLER_VERSION needs to be defined.
diff --git a/build_scripts/build_macos_m1.sh b/build_scripts/build_macos_m1.sh
index 5e01580e4e..8cb006e7b4 100644
--- a/build_scripts/build_macos_m1.sh
+++ b/build_scripts/build_macos_m1.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -euo pipefail
+set -o errexit -o nounset
 
 pip install setuptools_scm
 # The environment variable CHIA_INSTALLER_VERSION needs to be defined.
diff --git a/build_scripts/clean-runner.sh b/build_scripts/clean-runner.sh
index 2ae9804cd8..6aba280b14 100644
--- a/build_scripts/clean-runner.sh
+++ b/build_scripts/clean-runner.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 # Cleans up files/directories that may be left over from previous runs for a clean slate before starting a new build
 
+set -o errexit
+
 PWD=$(pwd)
 
 rm -rf ../venv || true
diff --git a/chia/wallet/puzzles/recompile-all.sh b/chia/wallet/puzzles/recompile-all.sh
index 1fcd5c7d55..999f0412c7 100755
--- a/chia/wallet/puzzles/recompile-all.sh
+++ b/chia/wallet/puzzles/recompile-all.sh
@@ -2,6 +2,8 @@
 
 # This hack is a quick way to recompile everything in this directory
 
+set -o errexit
+
 #BASE_DIR=`pwd | dirname`
 
 FILES=$(ls ./*.clvm)
diff --git a/install-gui.sh b/install-gui.sh
index bda599762d..278d156ca8 100755
--- a/install-gui.sh
+++ b/install-gui.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
-set -e
+
+set -o errexit
+
 export NODE_OPTIONS="--max-old-space-size=3000"
 
 SCRIPT_DIR=$(cd -- "$(dirname -- "$0")"; pwd)
diff --git a/install-timelord.sh b/install-timelord.sh
index 3be18e7f47..24fa760040 100644
--- a/install-timelord.sh
+++ b/install-timelord.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -o errexit
+
 if [ -z "$VIRTUAL_ENV" ]; then
   echo "This requires the chia python virtual environment."
   echo "Execute '. ./activate' before running."
diff --git a/install.sh b/install.sh
index 7d5ae61796..2f76b85994 100644
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+
+set -o errexit
 
 USAGE_TEXT="\
 Usage: $0 [-d]
diff --git a/run-py-tests.sh b/run-py-tests.sh
index f830f9134a..ba76043863 100755
--- a/run-py-tests.sh
+++ b/run-py-tests.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -o errexit
+
 python3 -m venv venv
 # shellcheck disable=SC1091
 . ./activate
diff --git a/start-gui.sh b/start-gui.sh
index 0a03589896..1ff9101caa 100755
--- a/start-gui.sh
+++ b/start-gui.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
-set -e
+
+set -o errexit
+
 export NODE_OPTIONS="--max-old-space-size=3000"
 
 SCRIPT_DIR=$(cd -- "$(dirname -- "$0")"; pwd)