diff --git a/README.md b/README.md
index 4d9f71b..6d0f99a 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@ image filesystem.
 This allows for a quite efficient caching, that can be pushed to another docker registry and downloaded on-demand, and a noticeably easier and
 more secure secret passing to the build context, as it happens in the user space itself.
 
+**Note**: skaffold buildArgs that use golang template syntax are **not** supported.
+
 ## Usage
 
 ## Example pipeline
diff --git a/entrypoint.sh b/entrypoint.sh
index 0b80b55..8faf427 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -75,8 +75,10 @@ do
     INPUT_IMAGE=$(trim ${INPUT_IMAGE})
     INPUT_TAG=$(trim ${INPUT_TAG})
     INPUT_DOCKERFILE=$(trim ${INPUT_DOCKERFILE})
+    SKAFFOLD_BUILD_ARGS=$(yq eval '.images[] | select(.imageName = env(INPUT_IMAGE)) | .docker.buildArgs[] | key + "=" + . | "--build-arg " + .' ais-build.yaml | tr  '\n' ' ')
+    
 
-    echo "Processing: context: [${INPUT_PATH}] image: [${INPUT_IMAGE}] tag: [${INPUT_TAG}] dockerfile: [${INPUT_DOCKERFILE}]"
+    echo "Processing: context: [${INPUT_PATH}] image: [${INPUT_IMAGE}] tag: [${INPUT_TAG}] dockerfile: [${INPUT_DOCKERFILE}] skaffold buildArgs: [${SKAFFOLD_BUILD_ARGS}]"
 
     export IMAGE=${INPUT_IMAGE}
     export TAG=${INPUT_TAG:-$([ "$BRANCH" == "master" ] && echo latest || echo $BRANCH)}
@@ -128,7 +130,7 @@ do
         fi
     fi
 
-    export ARGS="$CACHE $CONTEXT $DOCKERFILE $TARGET $DESTINATION $INPUT_EXTRA_ARGS"
+    export ARGS="$CACHE $CONTEXT $DOCKERFILE $TARGET $DESTINATION $INPUT_EXTRA_ARGS ${SKAFFOLD_BUILD_ARGS}"
 
     cat <<EOF >/kaniko/.docker/config.json
 {