diff --git a/Dockerfile b/Dockerfile
index f776b23..b8b0381 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.19.2-debug
+FROM gcr.io/kaniko-project/executor:v1.22.0-debug
 
 ENV HOME /root
 ENV USER root
diff --git a/plugin.sh b/plugin.sh
index 1fe41b1..0fdc1f7 100755
--- a/plugin.sh
+++ b/plugin.sh
@@ -72,7 +72,7 @@ if [ -n "${PLUGIN_CACHE_TTL:-}" ]; then
 fi
 
 if [ -n "${PLUGIN_BUILD_ARGS:-}" ]; then
-    BUILD_ARGS=$(echo "${PLUGIN_BUILD_ARGS}" | tr ',' '\n' | while read -r build_arg; do echo "--build-arg ${build_arg}"; done)
+    BUILD_ARGS=$(echo "${PLUGIN_BUILD_ARGS}" | tr ',' '\n' | while read -r build_arg; do echo "--build-arg \"${build_arg}\""; done)
 fi
 
 BUILD_ARGS_FROM_ENV=""
@@ -146,6 +146,6 @@ fi
     "${CACHE_TTL:-}" \
     "${CACHE_REPO:-}" \
     "${TARGET:-}" \
-    "${BUILD_ARGS:-}" \
+    ${BUILD_ARGS:-} \
     ${BUILD_ARGS_FROM_ENV:-} \
     "${MIRROR:-}"