diff --git a/build-system/scripts/extract_repo b/build-system/scripts/extract_repo
index 37102f85113..30a71b661ca 100755
--- a/build-system/scripts/extract_repo
+++ b/build-system/scripts/extract_repo
@@ -6,7 +6,7 @@ set -eu
 REPOSITORY=$1
 EXTRACT_FROM=${2:-/usr/src}
 EXTRACT_TO=${3:-./}
-IMAGE_COMMIT_URI=$ECR_DEPLOY_URL/$REPOSITORY:$COMMIT_HASH
+IMAGE_COMMIT_URI=$(calculate_image_uri $REPOSITORY)
 
 echo "Pulling $IMAGE_COMMIT_URI..."
 retry docker pull $IMAGE_COMMIT_URI > /dev/null 2>&1