diff --git a/barretenberg/cpp/scripts/run_tests b/barretenberg/cpp/scripts/run_tests
index 427a34531b09..8c4ed35047ef 100755
--- a/barretenberg/cpp/scripts/run_tests
+++ b/barretenberg/cpp/scripts/run_tests
@@ -3,7 +3,8 @@
 # 1. The number of ignition transcripts to download.
 # 2. The set of gtest binary names to run.
 # 3-n. The arguments to pass to the gtest binaries.
-set -exu
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
 
 NUM_TRANSCRIPTS=$1
 TESTS=$2
diff --git a/build-system/scripts/build b/build-system/scripts/build
index ba1ae13e2270..5355db6a183a 100755
--- a/build-system/scripts/build
+++ b/build-system/scripts/build
@@ -22,6 +22,7 @@
 # - Perform the build of the image itself. With the cache primed we should only have to rebuild the necessary layers.
 # - Push the image tagged with the commit hash to the cache.
 
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -euo pipefail
 
 REPOSITORY=$1
diff --git a/build-system/scripts/build_local b/build-system/scripts/build_local
index 71ee4a5ef141..52ef265b1135 100755
--- a/build-system/scripts/build_local
+++ b/build-system/scripts/build_local
@@ -6,6 +6,7 @@
 # If DOCKERFILE is excluded it tries to default to ./Dockerfile then ./<PROJECT_DIR_NAME>/Dockerfile
 # If REPO is excluded it defaults to PROJECT_DIR_NAME.
 
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 TARGET_PROJECT=${1:-}
diff --git a/build-system/scripts/calculate_content_hash b/build-system/scripts/calculate_content_hash
index fcf79d121059..e1eab385e2c9 100755
--- a/build-system/scripts/calculate_content_hash
+++ b/build-system/scripts/calculate_content_hash
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/calculate_image_uri b/build-system/scripts/calculate_image_uri
index 42bedecba2bf..a7b78a03e66a 100755
--- a/build-system/scripts/calculate_image_uri
+++ b/build-system/scripts/calculate_image_uri
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/check_npm_version b/build-system/scripts/check_npm_version
index 0d7de47828ec..35173d7e74d4 100755
--- a/build-system/scripts/check_npm_version
+++ b/build-system/scripts/check_npm_version
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 readonly LOCAL_VERSION=$(node -pe "require('./package.json').version")
diff --git a/build-system/scripts/check_rebuild b/build-system/scripts/check_rebuild
index cbfba6420cb3..93509f17cc57 100755
--- a/build-system/scripts/check_rebuild
+++ b/build-system/scripts/check_rebuild
@@ -1,5 +1,6 @@
 #!/bin/bash
 # If this script fails (nonzero exit), then the caller should rebuild.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -euo pipefail
 
 TAG=$1
diff --git a/build-system/scripts/clean_image_tags b/build-system/scripts/clean_image_tags
index 8e8b4082a448..832fdf4cda6d 100755
--- a/build-system/scripts/clean_image_tags
+++ b/build-system/scripts/clean_image_tags
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -e
 
 REPOSITORY=$1
diff --git a/build-system/scripts/cond_run_script b/build-system/scripts/cond_run_script
index 90cc9dd7a198..c14214ed94d1 100755
--- a/build-system/scripts/cond_run_script
+++ b/build-system/scripts/cond_run_script
@@ -4,6 +4,7 @@
 # Arguments are:
 # 1. REPOSITORY: The project repository name in ECR. Used to determine if there are changes since last success.
 # 2... ARGS: Script and arguments to run.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/cond_spot_run_build b/build-system/scripts/cond_spot_run_build
index 508096fb3a3a..9ed6596d0524 100755
--- a/build-system/scripts/cond_spot_run_build
+++ b/build-system/scripts/cond_spot_run_build
@@ -1,7 +1,8 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
 CPUS=$2
 
-cond_spot_run_script $REPOSITORY $CPUS build $REPOSITORY
\ No newline at end of file
+cond_spot_run_script $REPOSITORY $CPUS build $REPOSITORY
diff --git a/build-system/scripts/cond_spot_run_script b/build-system/scripts/cond_spot_run_script
index f3f49b715e99..9474ff6923cf 100755
--- a/build-system/scripts/cond_spot_run_script
+++ b/build-system/scripts/cond_spot_run_script
@@ -11,6 +11,7 @@
 #
 # Env vars are:
 # TAG_POSTFIX: Optional. If provided we check for the image tag with this postfix to determine if re-run is required.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/cond_spot_run_test b/build-system/scripts/cond_spot_run_test
index 383352bfe719..ca3249f1b7f9 100755
--- a/build-system/scripts/cond_spot_run_test
+++ b/build-system/scripts/cond_spot_run_test
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -euo pipefail
 
 REPOSITORY=$1
@@ -12,4 +13,5 @@ SCRIPT=$(query_manifest relativeProjectDir $REPOSITORY)/$SCRIPT
 
 # Specify a TAG_POSTFIX as the JOB_NAME
 mkdir -p /tmp/test-logs
-TAG_POSTFIX=$JOB_NAME cond_spot_run_script $REPOSITORY $CPUS $SCRIPT $@ | tee "/tmp/test-logs/$JOB_NAME.log"
+export TAG_POSTFIX=$JOB_NAME 
+cond_spot_run_script $REPOSITORY $CPUS $SCRIPT $@ | tee "/tmp/test-logs/$JOB_NAME.log"
diff --git a/build-system/scripts/create_dockerhub_manifest b/build-system/scripts/create_dockerhub_manifest
index fa65c29f5d9d..96b9df07fdf1 100755
--- a/build-system/scripts/create_dockerhub_manifest
+++ b/build-system/scripts/create_dockerhub_manifest
@@ -5,6 +5,7 @@
 # 3. Adds the arch specific tagged image to each list
 # 4. Pushes the 2 lists
 
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 if [ -z "$COMMIT_TAG" ]; then
diff --git a/build-system/scripts/create_ecr_manifest b/build-system/scripts/create_ecr_manifest
index 6163c952bb40..a020ddcfd2a6 100755
--- a/build-system/scripts/create_ecr_manifest
+++ b/build-system/scripts/create_ecr_manifest
@@ -5,6 +5,7 @@
 # 3. Creates a manifest list using a platform agnositc image uri, adds each image to it
 # 4. Pushes the manifest list 
 
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -e
 
 REPOSITORY=$1
@@ -35,4 +36,4 @@ done
 IFS=$OLD_IFS
 unset OLD_IFS
 
-docker manifest push --purge $FINAL
\ No newline at end of file
+docker manifest push --purge $FINAL
diff --git a/build-system/scripts/deploy b/build-system/scripts/deploy
index 09a1a42796a8..a404733ad91c 100755
--- a/build-system/scripts/deploy
+++ b/build-system/scripts/deploy
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/deploy_dockerhub b/build-system/scripts/deploy_dockerhub
index e11ae6f267b4..350c7fd1b81e 100755
--- a/build-system/scripts/deploy_dockerhub
+++ b/build-system/scripts/deploy_dockerhub
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 if [ -z "$COMMIT_TAG" ]; then
diff --git a/build-system/scripts/deploy_ecr b/build-system/scripts/deploy_ecr
index d8469733069c..3be534694c7a 100755
--- a/build-system/scripts/deploy_ecr
+++ b/build-system/scripts/deploy_ecr
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/deploy_global b/build-system/scripts/deploy_global
index 6065a94c14b8..28b70a286194 100755
--- a/build-system/scripts/deploy_global
+++ b/build-system/scripts/deploy_global
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Deployment script for global service (e.g. company website and metrics).
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/deploy_npm b/build-system/scripts/deploy_npm
index 225334cec769..cfc0f67f162f 100755
--- a/build-system/scripts/deploy_npm
+++ b/build-system/scripts/deploy_npm
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 readonly REPOSITORY=$1
diff --git a/build-system/scripts/deploy_s3 b/build-system/scripts/deploy_s3
index 343efec46f75..b4180957121b 100755
--- a/build-system/scripts/deploy_s3
+++ b/build-system/scripts/deploy_s3
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/deploy_service b/build-system/scripts/deploy_service
index c126becdf562..b014ca0d8230 100755
--- a/build-system/scripts/deploy_service
+++ b/build-system/scripts/deploy_service
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 # Redeploy service with latest image.
diff --git a/build-system/scripts/deploy_terraform b/build-system/scripts/deploy_terraform
index 637ef5c8be17..6d7f6ef81bb7 100755
--- a/build-system/scripts/deploy_terraform
+++ b/build-system/scripts/deploy_terraform
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/ensure_apt_package b/build-system/scripts/ensure_apt_package
index 33326c7f1fd7..08d9269d3086 100755
--- a/build-system/scripts/ensure_apt_package
+++ b/build-system/scripts/ensure_apt_package
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 if dpkg -s $1 &> /dev/null; then
diff --git a/build-system/scripts/ensure_repo b/build-system/scripts/ensure_repo
index f8ac8a2add6d..b818f8f9e88d 100755
--- a/build-system/scripts/ensure_repo
+++ b/build-system/scripts/ensure_repo
@@ -1,6 +1,7 @@
 #!/bin/bash
 # Logs the shell into the ECR instance at the given region, establishes if the given repository exists, creates it if it
 # doesn't, and re-applies thie lifecycle policy (determines when images should be automatically deleted) if it does.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 LIFECYCLE_POLICY='{
diff --git a/build-system/scripts/ensure_terraform b/build-system/scripts/ensure_terraform
index e04231e79f13..f2e33c5445db 100755
--- a/build-system/scripts/ensure_terraform
+++ b/build-system/scripts/ensure_terraform
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Downloads and installs `terraform` if it's not installed.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 [ ! -f /usr/local/bin/terraform ] || exit 0
diff --git a/build-system/scripts/erase_image_tags b/build-system/scripts/erase_image_tags
index 37aa69e84562..6c171e9f0ad9 100755
--- a/build-system/scripts/erase_image_tags
+++ b/build-system/scripts/erase_image_tags
@@ -1,6 +1,7 @@
 #!/bin/bash
 # Erase the image tag associated with the last commit for the given repository.
 # If TILL_COMMIT_HASH is given, erase tags going back in time until we reach TILL_COMMIT_HASH.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/extract_repo b/build-system/scripts/extract_repo
index 671a6341a653..37102f851135 100755
--- a/build-system/scripts/extract_repo
+++ b/build-system/scripts/extract_repo
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Given a repository, extracts the builds entire /usr/src dir to the given path.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/extract_tag_version b/build-system/scripts/extract_tag_version
index 5dc7cce6890a..55e79a1865e0 100755
--- a/build-system/scripts/extract_tag_version
+++ b/build-system/scripts/extract_tag_version
@@ -3,6 +3,7 @@
 # then checks if the commit tag variable (if any)
 # is a valid semver & echoes that valid semver.
 
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY="$1"
diff --git a/build-system/scripts/force_deploy_build b/build-system/scripts/force_deploy_build
index 0ec0627b0558..6856379e3466 100755
--- a/build-system/scripts/force_deploy_build
+++ b/build-system/scripts/force_deploy_build
@@ -4,6 +4,7 @@
 #
 # usage: ./deploy_force_build <repository> <force-build>
 # example: ./deploy_force_build aztec-sandbox true
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -e
 
 REPOSITORY=$1
diff --git a/build-system/scripts/init_submodules b/build-system/scripts/init_submodules
index 6a1d96ea9393..74aa8d639bcd 100755
--- a/build-system/scripts/init_submodules
+++ b/build-system/scripts/init_submodules
@@ -1,5 +1,6 @@
 #!/bin/bash
 # For a given repository, init any required submodules.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -euo pipefail
 
 REPOSITORY=$1
diff --git a/build-system/scripts/query_manifest b/build-system/scripts/query_manifest
index 85ccbf1e96d2..8768b5aa9917 100755
--- a/build-system/scripts/query_manifest
+++ b/build-system/scripts/query_manifest
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 CMD=$1
 REPO=$2
diff --git a/build-system/scripts/remote_run_script b/build-system/scripts/remote_run_script
index e2ff2ff77566..4e4bacb0672d 100755
--- a/build-system/scripts/remote_run_script
+++ b/build-system/scripts/remote_run_script
@@ -6,6 +6,7 @@
 # 2... ARGS: Script and arguments to run.
 #
 # e.g. remote_run_script 1.2.3.4 build my_repo
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 IP=$1
diff --git a/build-system/scripts/remote_runner b/build-system/scripts/remote_runner
index 8b0c338a2f79..243d98e47bf5 100755
--- a/build-system/scripts/remote_runner
+++ b/build-system/scripts/remote_runner
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
diff --git a/build-system/scripts/request_spot b/build-system/scripts/request_spot
index d87fd829eee6..86175eb06c8b 100755
--- a/build-system/scripts/request_spot
+++ b/build-system/scripts/request_spot
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 NAME=$1
diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
index ce6691e8b6cf..78ef8f5c0bc7 100755
--- a/build-system/scripts/setup_env
+++ b/build-system/scripts/setup_env
@@ -13,6 +13,7 @@ COMMIT_TAG=${2##*aztec-packages-}
 JOB_NAME=$3
 GIT_REPOSITORY_URL=${4:-}
 BRANCH=${5:-}
+COMMIT_MESSAGE=${6:-}
 
 BASH_ENV=${BASH_ENV:-}
 BUILD_SYSTEM_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
@@ -99,6 +100,12 @@ if [ -n "$COMMIT_HASH" ]; then
   mkdir -p ~/.ssh
   echo ${BUILD_INSTANCE_KEY:-} | base64 -d > ~/.ssh/build_instance_key
   chmod 600 ~/.ssh/build_instance_key
+  COMMIT_MESSAGE=`git log -n 1 --pretty=format:"%s" HEAD`
+  # if our commit messages has [debug ci] anywhere in it, we set -x in all build system BASH files
+  # this can also be used for other verbose logging
+  if [[ "$COMMIT_MESSAGE" == *"[debug ci]"* ]]; then
+    echo export BUILD_SYSTEM_DEBUG=1 >> $BASH_ENV
+  fi
 fi
 
 set +e
diff --git a/build-system/scripts/spot_run_script b/build-system/scripts/spot_run_script
index 920d661bb61b..d8cd288070a9 100755
--- a/build-system/scripts/spot_run_script
+++ b/build-system/scripts/spot_run_script
@@ -6,6 +6,7 @@
 #
 # Env vars:
 # JOB_NAME: Set within setup-env. The job name as per CI.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 CONTENT_HASH=$1
 CPUS=$2
diff --git a/build-system/scripts/spot_run_test_script b/build-system/scripts/spot_run_test_script
index 06d4d4553805..f3f05e0475ce 100755
--- a/build-system/scripts/spot_run_test_script
+++ b/build-system/scripts/spot_run_test_script
@@ -9,6 +9,7 @@ cd $(query_manifest projectDir $REPOSITORY)
 
 mkdir -p /tmp/test-logs
 
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -o pipefail
 
 CONTENT_HASH=$(calculate_content_hash $REPOSITORY)
diff --git a/build-system/scripts/store_test_benchmark_logs b/build-system/scripts/store_test_benchmark_logs
index bacc59f2d0c5..02ad0329614f 100755
--- a/build-system/scripts/store_test_benchmark_logs
+++ b/build-system/scripts/store_test_benchmark_logs
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/build-system/scripts/tag_remote_image b/build-system/scripts/tag_remote_image
index 56825299bcd7..bc7675b237c6 100755
--- a/build-system/scripts/tag_remote_image
+++ b/build-system/scripts/tag_remote_image
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 REPOSITORY=$1
diff --git a/circuits/cpp/scripts/build_run_tests_docker_local b/circuits/cpp/scripts/build_run_tests_docker_local
index 2ca15edddfbe..19eb1784f710 100755
--- a/circuits/cpp/scripts/build_run_tests_docker_local
+++ b/circuits/cpp/scripts/build_run_tests_docker_local
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 # To be called only LOCALLY for testing WITH docker.
diff --git a/circuits/cpp/scripts/run_coverage b/circuits/cpp/scripts/run_coverage
index 3aba8268e103..ae40b20cda4b 100755
--- a/circuits/cpp/scripts/run_coverage
+++ b/circuits/cpp/scripts/run_coverage
@@ -1,4 +1,5 @@
 #!bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
 
 # To be called LOCALLY for testing WITHOUT docker.
diff --git a/circuits/cpp/scripts/run_tests b/circuits/cpp/scripts/run_tests
index 003dac3ed130..dd7d7e213889 100755
--- a/circuits/cpp/scripts/run_tests
+++ b/circuits/cpp/scripts/run_tests
@@ -1,5 +1,6 @@
 #!/bin/bash
-set -exu
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
 
 # To be called from CI for testing with docker and AWS.
 # Can't be called locally unless AWS credentials are set up.
diff --git a/circuits/cpp/scripts/run_tests_local b/circuits/cpp/scripts/run_tests_local
index 1087ebc83a7e..d65ff5f358f8 100755
--- a/circuits/cpp/scripts/run_tests_local
+++ b/circuits/cpp/scripts/run_tests_local
@@ -1,5 +1,6 @@
 #!/bin/bash
-set -exu
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
 
 DIR="$(dirname "$0")"
 
diff --git a/scripts/ci/store_test_benchmark_logs b/scripts/ci/store_test_benchmark_logs
index 057d64b4bc33..403d3ed93604 100755
--- a/scripts/ci/store_test_benchmark_logs
+++ b/scripts/ci/store_test_benchmark_logs
@@ -1,4 +1,5 @@
 #!/bin/bash
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -e
 
 AZTEC_GITHUB_TOKEN=$1
diff --git a/yarn-project/canary/scripts/cond_run_script b/yarn-project/canary/scripts/cond_run_script
index df4292891375..32834cef2f1d 100755
--- a/yarn-project/canary/scripts/cond_run_script
+++ b/yarn-project/canary/scripts/cond_run_script
@@ -14,8 +14,8 @@
 # 2. SUCCESS_TAG: To track if this job needs to be run, the repository image is tagged with a success tag after a
 #    successful run. The script will only run if there were relevant code changes since the last successful commit.
 # 3... ARGS: Script to run and args.
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
 set -eu
-set -x
 
 REPOSITORY=$1
 shift
diff --git a/yarn-project/canary/scripts/run_tests b/yarn-project/canary/scripts/run_tests
index 23644dcdcc9b..ea52523134e7 100755
--- a/yarn-project/canary/scripts/run_tests
+++ b/yarn-project/canary/scripts/run_tests
@@ -1,7 +1,8 @@
 #!/bin/bash
 # This script is used to run an e2e test in CI (see config.yml and cond_spot_run_tests).
 # It sets a few environment variables used inside the docker-compose.yml, pulls images, and runs docker-compose.
-set -exu
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
 
 export TEST=$1
 export IMAGE=${2:-canary}
diff --git a/yarn-project/end-to-end/scripts/run_tests b/yarn-project/end-to-end/scripts/run_tests
index e766103da17a..97b1effcc9e4 100755
--- a/yarn-project/end-to-end/scripts/run_tests
+++ b/yarn-project/end-to-end/scripts/run_tests
@@ -1,7 +1,8 @@
 #!/bin/bash
 # This script is used to run an e2e test in CI (see config.yml and cond_spot_run_tests).
 # It sets a few environment variables used inside the docker-compose.yml, pulls images, and runs docker-compose.
-set -exu
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
 
 export TEST=$1
 export COMPOSE_FILE=${2:-docker-compose.yml}
diff --git a/yarn-project/end-to-end/scripts/run_tests_local b/yarn-project/end-to-end/scripts/run_tests_local
index 62555468b84e..c2b88d7af9f6 100755
--- a/yarn-project/end-to-end/scripts/run_tests_local
+++ b/yarn-project/end-to-end/scripts/run_tests_local
@@ -1,7 +1,8 @@
 #!/bin/bash
 # This script is used to run an e2e test in CI (see config.yml and cond_run_script).
 # It sets a few environment variables used inside the docker-compose.yml, pulls images, and runs docker-compose.
-set -exu
+[ -n "${BUILD_SYSTEM_DEBUG:-}" ] && set -x # conditionally trace
+set -eu
 
 export TEST=$1
 export COMPOSE_FILE=${2:-./scripts/docker-compose.yml}