diff --git a/build-system/scripts/deploy_dockerhub b/build-system/scripts/deploy_dockerhub
index f6f2ca734ce..8dbad378500 100755
--- a/build-system/scripts/deploy_dockerhub
+++ b/build-system/scripts/deploy_dockerhub
@@ -10,7 +10,7 @@ REPOSITORY=$1
 IMAGE_TAG=$COMMIT_TAG_VERSION
 IMAGE_COMMIT_URI=$ECR_DEPLOY_URL/$REPOSITORY:$COMMIT_HASH
 IMAGE_LATEST_URI=aztecprotocol/$REPOSITORY:latest
-
+COMMIT_TAG_VERSION=$COMMIT_TAG # default unless repo-specific
 # Check if it's a repo-specific tag
 if [[ "$COMMIT_TAG" == *"/"* ]]; then
   REPO_NAME="${COMMIT_TAG%%/*}"
@@ -23,8 +23,6 @@ if [[ "$COMMIT_TAG" == *"/"* ]]; then
     echo "REPO_NAME ($REPO_NAME) does not match REPOSITORY ($REPOSITORY). Exiting..."
     exit 1
   fi
-else
-  COMMIT_TAG_VERSION=$COMMIT_TAG
 fi
 IMAGE_TAG=$COMMIT_TAG_VERSION
 IMAGE_DEPLOY_URI=aztecprotocol/$REPOSITORY:$IMAGE_TAG
diff --git a/build-system/scripts/deploy_npm b/build-system/scripts/deploy_npm
index fa732f99238..8872e7e3e08 100755
--- a/build-system/scripts/deploy_npm
+++ b/build-system/scripts/deploy_npm
@@ -38,6 +38,7 @@ fi
 
 # If the commit tag itself has a dist-tag (e.g. v2.1.0-testnet.123), extract the dist-tag.
 TAG=$(echo "$VERSION" | grep -oP ".*-\K(.*)(?=\.\d+)" || true)
+TAG_ARG=""
 if [ -n "$TAG" ]; then
   TAG_ARG="--tag $TAG"
 fi