diff --git a/ci/apps/app-template.lib.yml b/ci/apps/app-template.lib.yml
index 911ce01222..a6c1de20e1 100644
--- a/ci/apps/app-template.lib.yml
+++ b/ci/apps/app-template.lib.yml
@@ -107,24 +107,30 @@ plan:
       run:
         path: pipeline-tasks/ci/apps/tasks/prepare-docker-build.sh
   - task: build
+    #@ def build_args(app):
+    #@ dockerfile_path = "repo/apps/" + app + "/Dockerfile"
+    #@ build_args_command = "$(awk -F= '{print \"--build-arg=\"$1\"=\"$2}' repo/.build-args)"
+    #@ kaniko_args="/kaniko/executor --context=repo --use-new-run --single-snapshot --cache=false --no-push --tar-path=image/image.tar --dockerfile=" + dockerfile_path + " " + build_args_command
+    #@ args = ["-exc"]
+    #@ args.append(kaniko_args)
+    #@ return args
+    #@ end
+    tags: ["kaniko"]
     attempts: 2
-    privileged: true
     config:
       platform: linux
       image_resource:
         type: registry-image
         source:
-          repository: vito/oci-build-task
+          repository: gcr.io/kaniko-project/executor
+          tag: debug
       inputs:
         - name: repo
       outputs:
         - name: image
-      params:
-        CONTEXT: repo
-        DOCKERFILE: #@ "repo/apps/" + app + "/Dockerfile"
-        BUILD_ARGS_FILE: repo/.build-args
       run:
-        path: build
+        path: /bin/sh
+        args: #@ build_args(app)
   - put: #@ edge_image_resource_name(app)
     params:
       image: image/image.tar
diff --git a/ci/core/template.lib.yml b/ci/core/template.lib.yml
index f1d486fbc9..68a2481619 100644
--- a/ci/core/template.lib.yml
+++ b/ci/core/template.lib.yml
@@ -205,24 +205,30 @@ plan:
       run:
         path: pipeline-tasks/ci/core/tasks/prepare-docker-build.sh
   - task: build
+    #@ def build_args(component):
+    #@ dockerfile_path = "repo/core/" + component + "/Dockerfile" + post_fix
+    #@ build_args_command = "$(awk -F= '{print \"--build-arg=\"$1\"=\"$2}' repo/.build-args)"
+    #@ kaniko_args="/kaniko/executor --context=repo --use-new-run --single-snapshot --cache=false --no-push --tar-path=image/image.tar --dockerfile=" + dockerfile_path + " " + build_args_command
+    #@ args = ["-exc"]
+    #@ args.append(kaniko_args)
+    #@ return args
+    #@ end
+    tags: ["kaniko"]
     attempts: 2
-    privileged: true
     config:
       platform: linux
       image_resource:
         type: registry-image
         source:
-          repository: vito/oci-build-task
+          repository: gcr.io/kaniko-project/executor
+          tag: debug
       inputs:
         - name: repo
       outputs:
         - name: image
-      params:
-        CONTEXT: repo
-        DOCKERFILE: #@ "repo/core/" + component + "/Dockerfile" + post_fix
-        BUILD_ARGS_FILE: repo/.build-args
       run:
-        path: build
+        path: /bin/sh
+        args: #@ build_args(component)
   - put: #@ edge_image_resource_name(component + post_fix)
     params:
       image: image/image.tar