diff --git a/bin/compile b/bin/compile
index b4dea75..7285e34 100755
--- a/bin/compile
+++ b/bin/compile
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 # bin/compile <build-dir> <cache-dir>
-
-set -e
-set -o pipefail
+set -eo pipefail; [[ $TRACE ]] && set -x
 
 NGINX_VERSION="1.10.1"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
diff --git a/bin/detect b/bin/detect
index f6a05c3..3877e6c 100755
--- a/bin/detect
+++ b/bin/detect
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # bin/detect <build-dir> <cache-dir>
-set -e
+set -eo pipefail; [[ $TRACE ]] && set -x
 
 # Exit early if app is clearly not an nginx app
 if [[ ! -f $1/.static ]]; then
diff --git a/bin/release b/bin/release
index 6c3250e..ae9fbde 100755
--- a/bin/release
+++ b/bin/release
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # bin/release <build-dir>
+set -eo pipefail; [[ $TRACE ]] && set -x
 
 cat <<EOF
 ---