diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index 4509e8e72..79470c5b6 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -246,7 +246,7 @@ jobs:
         build_machine:
           - aws-arm64
           - ubuntu-20.04
-        registries:
+        registry
           - 'docker.io'
          #- 'public.ecr.aws'
         exclude:
diff --git a/scripts/docker-create-push-manifests.sh b/scripts/docker-create-push-manifests.sh
index e0cb81520..7c67ae788 100755
--- a/scripts/docker-create-push-manifests.sh
+++ b/scripts/docker-create-push-manifests.sh
@@ -1,5 +1,5 @@
 ##!/usr/bin/env bash
-set -euo pipefail
+set -exuo pipefail
 
 img_amd64=$1
 IsPushLatest=$2