diff --git a/bin/create-blocklists.sh b/bin/create-blocklists.sh
index c6929df..08ccc9a 100755
--- a/bin/create-blocklists.sh
+++ b/bin/create-blocklists.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-
+# Set bash options
+[ -n "$DEBUG" ] && set -x
+set -o pipefail
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 SQUID_USER="${SQUID_USER:-squid}"
 SQUID_LOG_DIR="${SQUID_LOG_DIR:-/data/log/squid}"
 REDIRECT_URL="${REDIRECT_URL:-}"
diff --git a/bin/entrypoint-squid.sh b/bin/entrypoint-squid.sh
index 7eeb456..277df73 100755
--- a/bin/entrypoint-squid.sh
+++ b/bin/entrypoint-squid.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-
+# Set bash options
+[ -n "$DEBUG" ] && set -x
+set -o pipefail
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 PROXY_HOSTNAME=${PROXY_HOSTNAME:-proxy.casjay.net}
 export SQUID_PORT="${SQUID_PORT:-3127}"
 export E2GUARD_PORT="${E2GUARD_PORT:-3128}"