diff --git a/plugin.sh b/plugin.sh
index b0c12a2..165d2d6 100755
--- a/plugin.sh
+++ b/plugin.sh
@@ -7,22 +7,22 @@ export PATH=$PATH:/kaniko/
 REGISTRY=${PLUGIN_REGISTRY:-docker.io}
 
 if [ "${PLUGIN_USERNAME:-}" ] || [ "${PLUGIN_PASSWORD:-}" ]; then
-    REGISTRY_AUTH=`echo -n "${PLUGIN_USERNAME}:${PLUGIN_PASSWORD}" | base64 | tr -d "\n"`
+	REGISTRY_AUTH=`echo -n "${PLUGIN_USERNAME}:${PLUGIN_PASSWORD}" | base64 | tr -d "\n"`
 
-    cat > /kaniko/.docker/config.json <<EOF
+	cat > /kaniko/.docker/config.json <<EOF
 {
-    "auths": {
-        "${REGISTRY}": {
-            "auth": "${REGISTRY_AUTH}"
-        }
-    }
+	"auths": {
+		"${REGISTRY}": {
+			"auth": "${REGISTRY_AUTH}"
+		}
+	}
 }
 EOF
 fi
 
 if [ "${PLUGIN_JSON_KEY:-}" ];then
-    echo "${PLUGIN_JSON_KEY}" > /kaniko/gcr.json
-    export GOOGLE_APPLICATION_CREDENTIALS=/kaniko/gcr.json
+	echo "${PLUGIN_JSON_KEY}" > /kaniko/gcr.json
+	export GOOGLE_APPLICATION_CREDENTIALS=/kaniko/gcr.json
 fi
 
 DOCKERFILE=${PLUGIN_DOCKERFILE:-Dockerfile}
@@ -31,31 +31,31 @@ LOG=${PLUGIN_LOG:-info}
 EXTRA_OPTS=""
 
 if [[ -n "${PLUGIN_TARGET:-}" ]]; then
-    TARGET="--target=${PLUGIN_TARGET}"
+	TARGET="--target=${PLUGIN_TARGET}"
 fi
 
 if [[ "${PLUGIN_SKIP_TLS_VERIFY:-}" == "true" ]]; then
-    EXTRA_OPTS="--skip-tls-verify=true"
+	EXTRA_OPTS="--skip-tls-verify=true"
 fi
 
 if [[ "${PLUGIN_CACHE:-}" == "true" ]]; then
-    CACHE="--cache=true"
+	CACHE="--cache=true"
 fi
 
 if [ -n "${PLUGIN_CACHE_REPO:-}" ]; then
-    CACHE_REPO="--cache-repo=${REGISTRY}/${PLUGIN_CACHE_REPO}"
+	CACHE_REPO="--cache-repo=${REGISTRY}/${PLUGIN_CACHE_REPO}"
 fi
 
 if [ -n "${PLUGIN_CACHE_TTL:-}" ]; then
-    CACHE_TTL="--cache-ttl=${PLUGIN_CACHE_TTL}"
+	CACHE_TTL="--cache-ttl=${PLUGIN_CACHE_TTL}"
 fi
 
 if [ -n "${PLUGIN_BUILD_ARGS:-}" ]; then
-    BUILD_ARGS=$(echo "${PLUGIN_BUILD_ARGS}" | tr ',' '\n' | while read build_arg; do echo "--build-arg=${build_arg}"; done)
+	BUILD_ARGS=$(echo "${PLUGIN_BUILD_ARGS}" | tr ',' '\n' | while read build_arg; do echo "--build-arg=${build_arg}"; done)
 fi
 
 if [ -n "${PLUGIN_BUILD_ARGS_FROM_ENV:-}" ]; then
-    BUILD_ARGS_FROM_ENV=$(echo "${PLUGIN_BUILD_ARGS_FROM_ENV}" | tr ',' '\n' | while read build_arg; do echo "--build-arg ${build_arg}=$(eval "echo \$$build_arg")"; done)
+	BUILD_ARGS_FROM_ENV=$(echo "${PLUGIN_BUILD_ARGS_FROM_ENV}" | tr ',' '\n' | while read build_arg; do echo "--build-arg ${build_arg}=$(eval "echo \$$build_arg")"; done)
 fi
 
 # TODO: Test auto_tag behavior; potential bugs might still be here
@@ -63,48 +63,54 @@ fi
 # support format Major.Minor.Release or start with `v`
 # docker tags: Major, Major.Minor, Major.Minor.Release and latest
 if [[ "${PLUGIN_AUTO_TAG:-}" == "true" ]]; then
-    TAG=$(echo "${CI_COMMIT_TAG:-}" |sed 's/^v//g')
-    tag_part_count=$(echo "${TAG}" | tr '.' '\n' |wc -l)
-    # expect number
-    echo ${TAG} | grep -E "[a-z-]" &>/dev/null && isNum=1 || isNum=0
+	TAG=$(echo "${CI_COMMIT_TAG:-}" |sed 's/^v//g')
+	tag_part_count=$(echo "${TAG}" | tr '.' '\n' |wc -l)
+	# expect number
+	echo ${TAG} | grep -E "[a-z-]" &>/dev/null && isNum=1 || isNum=0
 
-    if [ ! -n "${TAG:-}" ]; then
-        echo "latest" > .tags
-    elif [ ${isNum} -eq 1 -o ${tag_part_count} -gt 3 ]; then
-        echo "${TAG},latest" > .tags
-    else
-        major=$(echo "${TAG}" | awk -F'.' '{print $1}')
-        minor=$(echo "${TAG}" | awk -F'.' '{print $2}')
-        release=$(echo "${TAG}" | awk -F'.' '{print $3}')
-    
-        major=${major:-0}
-        minor=${minor:-0}
-        release=${release:-0}
-    
-        echo "${major},${major}.${minor},${major}.${minor}.${release},latest" > .tags
-    fi  
+	if [ ! -n "${TAG:-}" ]; then
+		echo "latest" > .tags
+	elif [ ${isNum} -eq 1 -o ${tag_part_count} -gt 3 ]; then
+		echo "${TAG},latest" > .tags
+	else
+		major=$(echo "${TAG}" | awk -F'.' '{print $1}')
+		minor=$(echo "${TAG}" | awk -F'.' '{print $2}')
+		release=$(echo "${TAG}" | awk -F'.' '{print $3}')
+	
+		major=${major:-0}
+		minor=${minor:-0}
+		release=${release:-0}
+	
+		echo "${major},${major}.${minor},${major}.${minor}.${release},latest" > .tags
+	fi  
 fi
 
 if [ -n "${PLUGIN_TAGS:-}" ]; then
-    DESTINATIONS=$(echo "${PLUGIN_TAGS}" | tr ',' '\n' | while read tag; do echo "--destination=${REGISTRY}/${PLUGIN_REPO}:${tag} "; done)
+	DESTINATIONS=$(echo "${PLUGIN_TAGS}" | tr ',' '\n' | while read tag; do echo "--destination=${REGISTRY}/${PLUGIN_REPO}:${tag} "; done)
 elif [ -f .tags ]; then
-    DESTINATIONS=$(cat .tags| tr ',' '\n' | while read tag; do echo "--destination=${REGISTRY}/${PLUGIN_REPO}:${tag} "; done)
+	DESTINATIONS=$(cat .tags| tr ',' '\n' | while read tag; do echo "--destination=${REGISTRY}/${PLUGIN_REPO}:${tag} "; done)
 elif [ -n "${PLUGIN_REPO:-}" ]; then
-    DESTINATIONS="--destination=${REGISTRY}/${PLUGIN_REPO}:latest"
+	DESTINATIONS="--destination=${REGISTRY}/${PLUGIN_REPO}:latest"
 else
-    DESTINATIONS="--no-push"
-    # Cache is not valid with --no-push
-    CACHE=""
+	DESTINATIONS="--no-push"
+	# Cache is not valid with --no-push
+	CACHE=""
 fi
 
+COMMAND=$(cat <<-EOF
 /kaniko/executor -v ${LOG} \
-    --context=${CONTEXT} \
-    --dockerfile=${DOCKERFILE} \
-    ${EXTRA_OPTS} \
-    ${DESTINATIONS} \
-    ${CACHE:-} \
-    ${CACHE_TTL:-} \
-    ${CACHE_REPO:-} \
-    ${TARGET:-} \
-    ${BUILD_ARGS:-} \
-    ${BUILD_ARGS_FROM_ENV:-}
+	--context=${CONTEXT} \
+	--dockerfile=${DOCKERFILE} \
+	${EXTRA_OPTS} \
+	${DESTINATIONS} \
+	${CACHE:-} \
+	${CACHE_TTL:-} \
+	${CACHE_REPO:-} \
+	${TARGET:-} \
+	${BUILD_ARGS:-} \
+	${BUILD_ARGS_FROM_ENV:-}"
+EOF
+)
+
+echo "+ ${COMMAND}"
+eval "${COMMAND}"