diff --git a/scripts/run-stand-api-tests.sh b/scripts/run-stand-api-tests.sh
index 04f8363..a5b47e4 100644
--- a/scripts/run-stand-api-tests.sh
+++ b/scripts/run-stand-api-tests.sh
@@ -44,18 +44,22 @@ echo "  ADMIN_API_HOST=${ADMIN_API_HOST}"
 echo "  WS_HOST=${WS_HOST}"
 echo "  ADMIN_WS_HOST=${ADMIN_WS_HOST}"
 
-if ! docker image inspect eventhub-api-tests:local >/dev/null 2>&1; then
-  bash scripts/retry-docker-build.sh 5 60 -- \
-    docker buildx build \
-      --network=host \
-      --file docker/ApiTests.Dockerfile \
-      --tag eventhub-api-tests:local \
-      --load \
-      --provenance=false \
-      --sbom=false \
-      .
+IMAGE="eventhub-api-tests:local"
+if [[ -n "${GITHUB_SHA:-}" ]]; then
+  IMAGE="eventhub-api-tests:sha-${GITHUB_SHA:0:12}"
 fi
 
+echo "=== build API test image (${IMAGE}) ==="
+bash scripts/retry-docker-build.sh 5 60 -- \
+  docker buildx build \
+    --network=host \
+    --file docker/ApiTests.Dockerfile \
+    --tag "${IMAGE}" \
+    --load \
+    --provenance=false \
+    --sbom=false \
+    .
+
 docker run --rm --network=host \
   -e CT_MODE=remote \
   -e "API_HOST=${API_HOST}" \
@@ -70,6 +74,6 @@ docker run --rm --network=host \
   -e "ADMIN_MODER_PASSWORD=${ADMIN_MODER_PASSWORD:-}" \
   -e "ADMIN_SUPPORT_EMAIL=${ADMIN_SUPPORT_EMAIL:-}" \
   -e "ADMIN_SUPPORT_PASSWORD=${ADMIN_SUPPORT_PASSWORD:-}" \
-  eventhub-api-tests:local
+  "${IMAGE}"
 
 echo "=== API CT passed (${STAND}) ==="