diff --git a/cpp/scripts/bb-tests.sh b/cpp/scripts/bb-tests.sh
index 235aa111ff..4037b3ad36 100755
--- a/cpp/scripts/bb-tests.sh
+++ b/cpp/scripts/bb-tests.sh
@@ -6,7 +6,7 @@ set -eu
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 REPOSITORY=barretenberg-x86_64-linux-clang-assert
 # use the image rebuild patterns to compute a content hash, use this to get a URI
-IMAGE_URI="278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPOSITORY:cache-$CONTENT_HASH"
+IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
 docker pull $IMAGE_URI
 
 TESTS=(
diff --git a/cpp/scripts/bin-test.sh b/cpp/scripts/bin-test.sh
index b06c26036b..6370dbebb5 100755
--- a/cpp/scripts/bin-test.sh
+++ b/cpp/scripts/bin-test.sh
@@ -4,7 +4,8 @@ set -eu
 
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 REPOSITORY=barretenberg-x86_64-linux-clang-assert
-IMAGE_URI="278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPOSITORY:cache-$CONTENT_HASH"
+IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
+
 docker pull $IMAGE_URI
 
 docker run --rm -t $IMAGE_URI /bin/sh -c "\
diff --git a/cpp/scripts/run_aztec_circuits_tests b/cpp/scripts/run_aztec_circuits_tests
index d67176f098..bab5c7f220 100755
--- a/cpp/scripts/run_aztec_circuits_tests
+++ b/cpp/scripts/run_aztec_circuits_tests
@@ -20,7 +20,7 @@ shift # to aztec's circuits `run_tests_local`
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 
 REPOSITORY="barretenberg-circuits-${ARCH}-linux-clang-builder-runner"
-IMAGE_URI="278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPOSITORY:cache-$CONTENT_HASH"
+IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
 docker pull $IMAGE_URI
 
 if [ "$ARCH" != "wasm" ]; then
diff --git a/cpp/scripts/run_tests b/cpp/scripts/run_tests
index 965307ff5a..f6ccd5a435 100755
--- a/cpp/scripts/run_tests
+++ b/cpp/scripts/run_tests
@@ -14,7 +14,7 @@ $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
 
 # use the image rebuild patterns to compute a content hash, use this to get a URI
 REPOSITORY=barretenberg-x86_64-linux-clang-assert
-IMAGE_URI="278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPOSITORY:cache-$CONTENT_HASH"
+IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
 docker pull $IMAGE_URI
 
 if [ -f "$TESTS" ]; then
diff --git a/ts/scripts/run_tests b/ts/scripts/run_tests
index cd417d0724..7a97ff6ade 100755
--- a/ts/scripts/run_tests
+++ b/ts/scripts/run_tests
@@ -2,5 +2,7 @@
 set -e
 
 $(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
-IMAGE_URI=278380418400.dkr.ecr.us-east-2.amazonaws.com/bb.js:cache-$CONTENT_HASH
+
+REPOSITORY=bb.js
+IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri $REPOSITORY)
 docker run --rm $IMAGE_URI