diff --git a/tools/g2/lib/registry.sh b/tools/g2/lib/registry.sh
index 0912294e..b4a0cdd6 100644
--- a/tools/g2/lib/registry.sh
+++ b/tools/g2/lib/registry.sh
@@ -7,7 +7,7 @@ registry_down() {
 }
 
 registry_list_images() {
-    FILES=$(find "$(config_configuration)" -type f -name '*.yaml')
+    FILES=($(find "$(config_configuration)" -type f -name '*.yaml'))
 
     HOSTNAME_REGEX='[a-zA-Z0-9][a-zA-Z0-9_-]{0,62}'
     DOMAIN_NAME_REGEX="${HOSTNAME_REGEX}(\.${HOSTNAME_REGEX})*"
@@ -41,9 +41,9 @@ registry_populate() {
 }
 
 registry_replace_references() {
-    FILES="${*}"
-    for image in $(registry_list_images "${FILES}"); do
-        sed -i "s;${image};registry:5000/${image};g" "${FILES}"
+    FILES=(${@})
+    for image in $(registry_list_images); do
+        sed -i "s;${image};registry:5000/${image};g" "${FILES[@]}"
     done
 }
 
diff --git a/tools/g2/lib/ssh.sh b/tools/g2/lib/ssh.sh
index 651c3d12..a7fdbd08 100644
--- a/tools/g2/lib/ssh.sh
+++ b/tools/g2/lib/ssh.sh
@@ -3,7 +3,7 @@ rsync_cmd() {
 }
 
 ssh_cmd() {
-    if [[ ${GATE_DEBUG} = "1" ]]; then
+    if [[ -v GATE_DEBUG && ${GATE_DEBUG} = "1" ]]; then
         ssh -F "${SSH_CONFIG_DIR}/config" -v "${@}"
     else
         ssh -F "${SSH_CONFIG_DIR}/config" "${@}"
diff --git a/tools/gate.sh b/tools/gate.sh
index 60179843..9a9d5770 100755
--- a/tools/gate.sh
+++ b/tools/gate.sh
@@ -5,7 +5,7 @@ set -e
 SCRIPT_DIR=$(realpath "$(dirname "${0}")")
 WORKSPACE=$(realpath "${SCRIPT_DIR}/..")
 GATE_UTILS=${WORKSPACE}/tools/g2/lib/all.sh
-TEMP_DIR=$(mktemp -d)
+TEMP_DIR=${TEMP_DIR:-$(mktemp -d)}
 chmod -R 755 "${TEMP_DIR}"
 
 GATE_COLOR=${GATE_COLOR:-1}
@@ -37,14 +37,8 @@ while read -u 3 stage; do
     NAME=$(echo "${stage}" | jq -r .name)
     STAGE_CMD=${STAGES_DIR}/$(echo "${stage}" | jq -r .script)
 
-    if echo "${stage}" | jq -e .arguments > /dev/null; then
-        ARGUMENTS=($(echo "${stage}" | jq -r '.arguments[]'))
-    else
-        ARGUMENTS=
-    fi
-
     log_stage_header "${NAME}"
-    if $STAGE_CMD ${ARGUMENTS[*]}; then
+    if echo "${stage}" | jq -r '.arguments | @sh' | xargs "${STAGE_CMD}" ; then
         log_stage_success
     else
         log_color_reset