diff --git a/ci/audit.sh b/ci/audit.sh
index 2c8c4ecaf..a5a554962 100755
--- a/ci/audit.sh
+++ b/ci/audit.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Audits project dependencies for security vulnerabilities
 #
diff --git a/ci/crate-version.sh b/ci/crate-version.sh
index 8d0a25a46..f2ca748f7 100755
--- a/ci/crate-version.sh
+++ b/ci/crate-version.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Outputs the current crate version
 #
diff --git a/ci/docker-run.sh b/ci/docker-run.sh
index 9294a8a35..ea877fa72 100755
--- a/ci/docker-run.sh
+++ b/ci/docker-run.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 usage() {
   echo "Usage: $0 [--nopull] [docker image name] [command]"
diff --git a/ci/docker-rust-nightly/build.sh b/ci/docker-rust-nightly/build.sh
index f84ffb88a..45da0a43f 100755
--- a/ci/docker-rust-nightly/build.sh
+++ b/ci/docker-rust-nightly/build.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 cd "$(dirname "$0")"
 
diff --git a/ci/docker-rust/build.sh b/ci/docker-rust/build.sh
index b35f6d92e..c0f1e0cfe 100755
--- a/ci/docker-rust/build.sh
+++ b/ci/docker-rust/build.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 cd "$(dirname "$0")"
 
diff --git a/ci/docker-snapcraft/build.sh b/ci/docker-snapcraft/build.sh
index bfa403877..611507b88 100755
--- a/ci/docker-snapcraft/build.sh
+++ b/ci/docker-snapcraft/build.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 cd "$(dirname "$0")"
 
diff --git a/ci/docker-solana/build.sh b/ci/docker-solana/build.sh
index 674d335ab..662c1f7ed 100755
--- a/ci/docker-solana/build.sh
+++ b/ci/docker-solana/build.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 cd "$(dirname "$0")"
 eval "$(../channel-info.sh)"
diff --git a/ci/docker-solana/entrypoint.sh b/ci/docker-solana/entrypoint.sh
index 19abd06e2..844ae7d69 100755
--- a/ci/docker-solana/entrypoint.sh
+++ b/ci/docker-solana/entrypoint.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 export RUST_LOG=${RUST_LOG:-solana=info} # if RUST_LOG is unset, default to info
 export RUST_BACKTRACE=1
diff --git a/ci/is-pr.sh b/ci/is-pr.sh
index e4deff34e..9c51140bc 100755
--- a/ci/is-pr.sh
+++ b/ci/is-pr.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # The standard BUILDKITE_PULL_REQUEST environment variable is always "false" due
 # to how solana-ci-gate is used to trigger PR builds rather than using the
diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh
index 82827fa41..7116366c6 100755
--- a/ci/localnet-sanity.sh
+++ b/ci/localnet-sanity.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Perform a quick sanity test on a leader, drone, validator and client running
 # locally on the same machine
diff --git a/ci/pr-snap.sh b/ci/pr-snap.sh
index 019da4383..116c8ed9f 100755
--- a/ci/pr-snap.sh
+++ b/ci/pr-snap.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Only run snap.sh for pull requests that modify files under /snap
 #
diff --git a/ci/publish-book.sh b/ci/publish-book.sh
index 964db1ab2..39214325c 100755
--- a/ci/publish-book.sh
+++ b/ci/publish-book.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/publish-bpf-sdk.sh b/ci/publish-bpf-sdk.sh
index d0eeb208d..960a30ee1 100755
--- a/ci/publish-bpf-sdk.sh
+++ b/ci/publish-bpf-sdk.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/publish-crate.sh b/ci/publish-crate.sh
index 453f72131..c7f8265af 100755
--- a/ci/publish-crate.sh
+++ b/ci/publish-crate.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/publish-solana-tar.sh b/ci/publish-solana-tar.sh
index bcc13e44a..71558a915 100755
--- a/ci/publish-solana-tar.sh
+++ b/ci/publish-solana-tar.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/run-local.sh b/ci/run-local.sh
index 247348c8b..55e0a2fd5 100755
--- a/ci/run-local.sh
+++ b/ci/run-local.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Run the entire buildkite CI pipeline locally for pre-testing before sending a
 # Github pull request
diff --git a/ci/shellcheck.sh b/ci/shellcheck.sh
index cc1c97ae4..669e3bd6f 100755
--- a/ci/shellcheck.sh
+++ b/ci/shellcheck.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Reference: https://github.com/koalaman/shellcheck/wiki/Directive
 
diff --git a/ci/snap.sh b/ci/snap.sh
index 513ab8b9a..37c4bcf78 100755
--- a/ci/snap.sh
+++ b/ci/snap.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/test-bench.sh b/ci/test-bench.sh
index 294602b40..f1fc9327f 100755
--- a/ci/test-bench.sh
+++ b/ci/test-bench.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/test-large-network.sh b/ci/test-large-network.sh
index 6a5e36f4e..2587d2401 100755
--- a/ci/test-large-network.sh
+++ b/ci/test-large-network.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 here=$(dirname "$0")
 cd "$here"/..
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index aa0bb6aa0..1402afc06 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 source ci/upload_ci_artifact.sh
diff --git a/ci/test-stable-perf.sh b/ci/test-stable-perf.sh
index 0af0f68e0..c60bc8505 100755
--- a/ci/test-stable-perf.sh
+++ b/ci/test-stable-perf.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index 92f300a87..62de6a074 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/testnet-automation-cleanup.sh b/ci/testnet-automation-cleanup.sh
index 0f49ab995..ce69aa88a 100755
--- a/ci/testnet-automation-cleanup.sh
+++ b/ci/testnet-automation-cleanup.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/testnet-automation.sh b/ci/testnet-automation.sh
index 6d445cd5d..3b365d32a 100755
--- a/ci/testnet-automation.sh
+++ b/ci/testnet-automation.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/testnet-deploy.sh b/ci/testnet-deploy.sh
index 32b880c32..227bf359e 100755
--- a/ci/testnet-deploy.sh
+++ b/ci/testnet-deploy.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")"/..
 
diff --git a/ci/testnet-manager.sh b/ci/testnet-manager.sh
index da86be0c8..b9b739d17 100755
--- a/ci/testnet-manager.sh
+++ b/ci/testnet-manager.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")"/..
 
diff --git a/ci/testnet-sanity.sh b/ci/testnet-sanity.sh
index 5f49cd96a..5a834114e 100755
--- a/ci/testnet-sanity.sh
+++ b/ci/testnet-sanity.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")/.."
 
diff --git a/ci/version-check.sh b/ci/version-check.sh
index 096f55d00..81c7b5f02 100755
--- a/ci/version-check.sh
+++ b/ci/version-check.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 require() {
   declare expectedProgram="$1"
diff --git a/fetch-perf-libs.sh b/fetch-perf-libs.sh
index 92a4d8e6a..8d5abc20f 100755
--- a/fetch-perf-libs.sh
+++ b/fetch-perf-libs.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 if [[ $(uname) != Linux ]]; then
   echo Performance libraries are only available for Linux
diff --git a/multinode-demo/client.sh b/multinode-demo/client.sh
index d8f3a6292..11d91a085 100755
--- a/multinode-demo/client.sh
+++ b/multinode-demo/client.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 here=$(dirname "$0")
 # shellcheck source=multinode-demo/common.sh
diff --git a/net/gce.sh b/net/gce.sh
index d57c5947f..dcc378070 100755
--- a/net/gce.sh
+++ b/net/gce.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 here=$(dirname "$0")
 # shellcheck source=net/common.sh
@@ -380,7 +381,8 @@ EOF
 
   declare startupScript="$netConfigDir"/instance-startup-script.sh
   cat > "$startupScript" <<EOF
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 # autogenerated at $(date)
 
 cat > /etc/motd <<EOM
diff --git a/net/init-metrics.sh b/net/init-metrics.sh
index 2fc8f5147..6b51f945f 100755
--- a/net/init-metrics.sh
+++ b/net/init-metrics.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 here=$(dirname "$0")
 # shellcheck source=net/common.sh
diff --git a/net/net.sh b/net/net.sh
index f829e6a45..fcfe051b6 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 here=$(dirname "$0")
 SOLANA_ROOT="$(cd "$here"/..; pwd)"
diff --git a/net/remote/remote-client.sh b/net/remote/remote-client.sh
index ec4dcc51e..5ad440cb5 100755
--- a/net/remote/remote-client.sh
+++ b/net/remote/remote-client.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")"/../..
 
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index 7caa210e3..72f6a614f 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")"/../..
 
diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh
index b3fc06316..0e8c7dbe0 100755
--- a/net/remote/remote-sanity.sh
+++ b/net/remote/remote-sanity.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # This script is to be run on the leader node
 #
diff --git a/net/scripts/add-solana-user-authorized_keys.sh b/net/scripts/add-solana-user-authorized_keys.sh
index d06b669da..260e36c7a 100755
--- a/net/scripts/add-solana-user-authorized_keys.sh
+++ b/net/scripts/add-solana-user-authorized_keys.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
diff --git a/net/scripts/create-solana-user.sh b/net/scripts/create-solana-user.sh
index f53f9db3c..5e89fac02 100755
--- a/net/scripts/create-solana-user.sh
+++ b/net/scripts/create-solana-user.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
diff --git a/net/scripts/disable-background-upgrades.sh b/net/scripts/disable-background-upgrades.sh
index 96ccce627..683da62ab 100755
--- a/net/scripts/disable-background-upgrades.sh
+++ b/net/scripts/disable-background-upgrades.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 #
 # Prevent background upgrades that block |apt-get|
 #
diff --git a/net/scripts/install-docker.sh b/net/scripts/install-docker.sh
index 5759c075c..fe783ceec 100755
--- a/net/scripts/install-docker.sh
+++ b/net/scripts/install-docker.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
diff --git a/net/scripts/install-earlyoom.sh b/net/scripts/install-earlyoom.sh
index 108755e34..587ab5846 100755
--- a/net/scripts/install-earlyoom.sh
+++ b/net/scripts/install-earlyoom.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 #
 # Install EarlyOOM
 #
diff --git a/net/scripts/install-libssl-compatability.sh b/net/scripts/install-libssl-compatability.sh
index a81d925d7..38d0f48b4 100755
--- a/net/scripts/install-libssl-compatability.sh
+++ b/net/scripts/install-libssl-compatability.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
diff --git a/net/scripts/install-rsync.sh b/net/scripts/install-rsync.sh
index 5dfe38e09..ac2b06a0d 100755
--- a/net/scripts/install-rsync.sh
+++ b/net/scripts/install-rsync.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 #
 # Rsync setup for Snap builds
 #
diff --git a/net/scripts/network-config.sh b/net/scripts/network-config.sh
index 55ab3ba93..cc8429306 100755
--- a/net/scripts/network-config.sh
+++ b/net/scripts/network-config.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 #
 
 [[ $(uname) = Linux ]] || exit 1
diff --git a/net/scripts/remove-docker-interface.sh b/net/scripts/remove-docker-interface.sh
index 15145140f..fc1d5512b 100755
--- a/net/scripts/remove-docker-interface.sh
+++ b/net/scripts/remove-docker-interface.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 #
 # Some instances have docker running and docker0 network interface confuses
 # gossip and airdrops fail.  As a workaround for now simply remove the docker0
diff --git a/net/scripts/update-default-cuda.sh b/net/scripts/update-default-cuda.sh
index 127d8a621..6912cff54 100755
--- a/net/scripts/update-default-cuda.sh
+++ b/net/scripts/update-default-cuda.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 #
 # Updates the default cuda symlink to the supported version
 #
diff --git a/programs/bpf/rust/noop/build.sh b/programs/bpf/rust/noop/build.sh
index 2b7dcffe7..9839ff6f7 100755
--- a/programs/bpf/rust/noop/build.sh
+++ b/programs/bpf/rust/noop/build.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -ex
+#!/usr/bin/env bash
+set -ex
 
 # TODO building release flavor with rust produces a bunch of output .bc files
 INTERDIR=../../../target/release
diff --git a/scripts/increment-cargo-version.sh b/scripts/increment-cargo-version.sh
index 5e2866779..fe6365d3b 100755
--- a/scripts/increment-cargo-version.sh
+++ b/scripts/increment-cargo-version.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 usage() {
   cat <<EOF
diff --git a/scripts/install-native-programs.sh b/scripts/install-native-programs.sh
index b5842a9c7..3cf1ee945 100755
--- a/scripts/install-native-programs.sh
+++ b/scripts/install-native-programs.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Installs native programs as |cargo install| doesn't know about them
 #
diff --git a/scripts/metrics-write-datapoint.sh b/scripts/metrics-write-datapoint.sh
index 67dad0a3f..42dbf0b4e 100755
--- a/scripts/metrics-write-datapoint.sh
+++ b/scripts/metrics-write-datapoint.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Send a metrics datapoint
 #
diff --git a/scripts/net-stats.sh b/scripts/net-stats.sh
index d30c1cc9c..1945d3580 100755
--- a/scripts/net-stats.sh
+++ b/scripts/net-stats.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Reports network statistics
 #
diff --git a/scripts/oom-monitor.sh b/scripts/oom-monitor.sh
index 50bb520dd..9eeb99cdc 100755
--- a/scripts/oom-monitor.sh
+++ b/scripts/oom-monitor.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Reports Linux OOM Killer activity
 #
diff --git a/scripts/wallet-help.sh b/scripts/wallet-help.sh
index b5dbea7e1..92d156ed9 100755
--- a/scripts/wallet-help.sh
+++ b/scripts/wallet-help.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 
 cd "$(dirname "$0")"/..
 
diff --git a/scripts/wallet-sanity.sh b/scripts/wallet-sanity.sh
index bbb187b5a..b0702df56 100755
--- a/scripts/wallet-sanity.sh
+++ b/scripts/wallet-sanity.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
+set -e
 #
 # Wallet sanity test
 #