diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml
index e89c603d..11321bcd 100644
--- a/.circleci/test-deploy.yml
+++ b/.circleci/test-deploy.yml
@@ -320,7 +320,8 @@ workflows:
           path: workspace
           extra_build_args: >-
             --build-arg NPM_TOKEN=${NPM_TOKEN}
-            --build-arg=${CIRCLE_SHA1:0:7}
+            --build-arg ${CIRCLE_SHA1:0:7}
+            --build-arg=TEST='This is a test'
           set_repo_policy: true
           repo_policy_path: ./sample/repo-policy.json
           executor: amd64
diff --git a/src/executors/default.yml b/src/executors/default.yml
index a6972fb9..9af2733c 100644
--- a/src/executors/default.yml
+++ b/src/executors/default.yml
@@ -15,5 +15,4 @@ parameters:
 machine:
   image: <<parameters.image>>
   docker_layer_caching: <<parameters.docker_layer_caching>>
-
 resource_class: <<parameters.resource_class>>
diff --git a/src/scripts/docker_buildx.sh b/src/scripts/docker_buildx.sh
index c9151667..5039feac 100644
--- a/src/scripts/docker_buildx.sh
+++ b/src/scripts/docker_buildx.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 AWS_ECR_EVAL_REGION="$(eval echo "${AWS_ECR_STR_REGION}")"
 AWS_ECR_EVAL_REPO="$(eval echo "${AWS_ECR_STR_REPO}")"
 AWS_ECR_EVAL_TAG="$(eval echo "${AWS_ECR_STR_TAG}")"
@@ -17,11 +18,14 @@ AWS_ECR_EVAL_LIFECYCLE_POLICY_PATH="$(eval echo "${AWS_ECR_STR_LIFECYCLE_POLICY_
 BUILDX_NO_DEFAULT_ATTESTATIONS=1
 
 if [ -n "${AWS_ECR_STR_EXTRA_BUILD_ARGS}" ]; then
-  IFS=" " read -a args -r <<<"${AWS_ECR_STR_EXTRA_BUILD_ARGS[@]}"
+  args=()
+  # shellcheck disable=SC2086
+  eval 'for p in '$AWS_ECR_STR_EXTRA_BUILD_ARGS'; do args+=("$p"); done'
   for arg in "${args[@]}"; do
     set -- "$@" "$arg"
   done
 fi
+
 ECR_COMMAND="ecr"
 number_of_tags_in_ecr=0