diff --git a/build-system/scripts/deploy_dockerhub b/build-system/scripts/deploy_dockerhub
index 6bfbc741a64..21d6a0e6406 100755
--- a/build-system/scripts/deploy_dockerhub
+++ b/build-system/scripts/deploy_dockerhub
@@ -37,8 +37,9 @@ echo "Deploying to dockerhub: $IMAGE_DEPLOY_URI"
 # Login.
 retry ensure_repo $REPOSITORY $ECR_DEPLOY_REGION
 
-# Login to dockerhub.
+# Login to dockerhub and ecr
 dockerhub_login
+ecr_login
 
 echo "Pulling $IMAGE_COMMIT_URI"
 # Pull image.
diff --git a/yarn-project/deploy_npm.sh b/yarn-project/deploy_npm.sh
index 8b9a54c610c..d4cd42e51f2 100755
--- a/yarn-project/deploy_npm.sh
+++ b/yarn-project/deploy_npm.sh
@@ -37,7 +37,7 @@ function deploy_package() {
     TMP=$(mktemp)
     jq --arg v $VERSION '.version = $v' package.json > $TMP && mv $TMP package.json
 
-    if [ -z "$STANDALONE" ]; then
+    if [ -z "${STANDALONE:-}" ]; then
     # Update each dependent @aztec package version in package.json.
     for PKG in $(jq --raw-output ".dependencies | keys[] | select(contains(\"@aztec/\"))" package.json); do
         jq --arg v $VERSION ".dependencies[\"$PKG\"] = \$v" package.json > $TMP && mv $TMP package.json
@@ -49,7 +49,7 @@ function deploy_package() {
     package.json > $TMP && mv $TMP package.json
 
     # Publish
-    if [ -n "$COMMIT_TAG" ] ; then 
+    if [ -n "${COMMIT_TAG:-}" ] ; then 
         npm publish $TAG_ARG --access public
     else
         npm publish --dry-run $TAG_ARG --access public