diff --git a/common/docker-entrypoint.d/00-check-for-required-env.sh b/common/docker-entrypoint.d/00-check-for-required-env.sh
index 2a057ff4..c2fb318f 100755
--- a/common/docker-entrypoint.d/00-check-for-required-env.sh
+++ b/common/docker-entrypoint.d/00-check-for-required-env.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 #  Copyright 2020 F5 Networks
 #
diff --git a/common/docker-entrypoint.sh b/common/docker-entrypoint.sh
index 024d0aa7..c47b1036 100644
--- a/common/docker-entrypoint.sh
+++ b/common/docker-entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 #  Copyright 2020 F5 Networks
 #
@@ -17,8 +17,6 @@
 
 # vim:sw=4:ts=4:et
 
-set -e
-
 parseBoolean() {
   case "$1" in
     TRUE | true | True | YES | Yes | 1)
diff --git a/standalone_ubuntu_oss_install.sh b/standalone_ubuntu_oss_install.sh
index 7c4f4703..e4313d60 100644
--- a/standalone_ubuntu_oss_install.sh
+++ b/standalone_ubuntu_oss_install.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -o errexit   # abort on nonzero exit status
 set -o pipefail  # don't hide errors within pipes
@@ -213,7 +213,7 @@ chown root:root /etc/nginx/environment
 chmod og-rwx /etc/nginx/environment
 
 cat > /usr/local/bin/template_nginx_config.sh << 'EOF'
-#!/usr/bin/env bash
+#!/bin/bash
 
 ME=$(basename $0)
 
diff --git a/test.sh b/test.sh
index ca841707..dcf0ec50 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #
 #  Copyright 2020 F5 Networks
diff --git a/test/integration/test_api.sh b/test/integration/test_api.sh
index 1233dbd2..4b5b146e 100644
--- a/test/integration/test_api.sh
+++ b/test/integration/test_api.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #
 #  Copyright 2020 F5 Networks