diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a77de63ef29..6b11ab44b5e6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,7 +68,8 @@ checkout: &checkout
 setup_env: &setup_env
   run:
     name: "Setup environment"
-    command: ./build-system/scripts/setup_env "$CIRCLE_SHA1" "$CIRCLE_TAG" "$CIRCLE_JOB" "$CIRCLE_REPOSITORY_URL" "$CIRCLE_BRANCH"
+    command: |
+      ./build-system/scripts/setup_env "$CIRCLE_SHA1" "$CIRCLE_TAG" "$CIRCLE_JOB" "$CIRCLE_REPOSITORY_URL" "$CIRCLE_BRANCH"
 
 # This step is used to save logs from various barretenberg test to the workspace so that they can be used later to parse benchmark values out of them
 save_logs: &save_logs
@@ -376,6 +377,7 @@ jobs:
       - run:
           name: Build
           command: |
+            echo $PATH
             which build
             which jq
             which yq
@@ -385,7 +387,6 @@ jobs:
   yarn-project-base:
     machine:
       image: ubuntu-2204:2023.07.2
-    resource_class: large
     steps:
       - *checkout
       - *setup_env
diff --git a/barretenberg/ts/scripts/run_tests b/barretenberg/ts/scripts/run_tests
index ed93c9a80916..fa1630bac9b9 100755
--- a/barretenberg/ts/scripts/run_tests
+++ b/barretenberg/ts/scripts/run_tests
@@ -3,6 +3,6 @@ set -xe
 
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 
-REPOSITORY=bb.js
+REPOSITORY=bb-js
 IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
 docker run --rm $IMAGE_URI
diff --git a/build-system/scripts/build b/build-system/scripts/build
index 7828ea480f05..8dcc57429669 100755
--- a/build-system/scripts/build
+++ b/build-system/scripts/build
@@ -22,7 +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.
 
-set -euo pipefail
+set -xeuo pipefail
 
 REPOSITORY=$1
 FORCE_BUILD=${2:-"false"}
diff --git a/build-system/scripts/calculate_content_hash b/build-system/scripts/calculate_content_hash
index f9664b716061..6f4f548bad57 100755
--- a/build-system/scripts/calculate_content_hash
+++ b/build-system/scripts/calculate_content_hash
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eu
+set -exu
 
 REPOSITORY=$1
 COMMIT_HASH=${2:-${COMMIT_HASH:-$(git rev-parse HEAD)}}
diff --git a/build-system/scripts/calculate_image_uri b/build-system/scripts/calculate_image_uri
index 42bedecba2bf..a63b462394e3 100755
--- a/build-system/scripts/calculate_image_uri
+++ b/build-system/scripts/calculate_image_uri
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+set -exu
 
 REPOSITORY=$1
 # Assume we might be calling this directly without build system in path
diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
index 41250a681b35..26ed4afc489f 100755
--- a/build-system/scripts/setup_env
+++ b/build-system/scripts/setup_env
@@ -69,7 +69,7 @@ echo export ROOT_PATH=$PWD >> $BASH_ENV
 echo export BUILD_SYSTEM_PATH=$BUILD_SYSTEM_PATH >> $BASH_ENV
 echo export DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1} >> $BASH_ENV
 echo export SSH_CONFIG_PATH=$BUILD_SYSTEM_PATH/remote/ssh_config >> $BASH_ENV
-echo export PATH=$PATH:$BUILD_SYSTEM_PATH/scripts >> $BASH_ENV
+echo export PATH=\$PATH:$BUILD_SYSTEM_PATH/scripts >> $BASH_ENV
 echo export AWS_DEFAULT_REGION=eu-west-2 >> $BASH_ENV
 echo export ECR_REGION=us-east-2 >> $BASH_ENV
 echo export AWS_ACCOUNT=278380418400 >> $BASH_ENV