diff --git a/_CI-CD/debian-golang/tekton.yaml b/_CI-CD/debian-golang/tekton.yaml
index b23f558..40f20a4 100644
--- a/_CI-CD/debian-golang/tekton.yaml
+++ b/_CI-CD/debian-golang/tekton.yaml
@@ -20,4 +20,4 @@ spec:
       - name: git-source
         persistentVolumeClaim:
           claimName: tektoncd-workspaces
-        subPath: usr_src/tekton-debian-stable-golang
\ No newline at end of file
+        subPath: tekton/debian-stable-golang
\ No newline at end of file
diff --git a/_CI-CD/debian-stable-build-essential/tekton.yaml b/_CI-CD/debian-stable-build-essential/tekton.yaml
index d263e66..8a89de6 100644
--- a/_CI-CD/debian-stable-build-essential/tekton.yaml
+++ b/_CI-CD/debian-stable-build-essential/tekton.yaml
@@ -20,4 +20,4 @@ spec:
       - name: git-source
         persistentVolumeClaim:
           claimName: tektoncd-workspaces
-        subPath: usr_src/tekton-debian-stable-build-essential
\ No newline at end of file
+        subPath: tekton/debian-stable-build-essential
\ No newline at end of file
diff --git a/_CI-CD/debian-stable-php-fpm/tekton.yaml b/_CI-CD/debian-stable-php-fpm/tekton.yaml
index 15ae633..23565f6 100644
--- a/_CI-CD/debian-stable-php-fpm/tekton.yaml
+++ b/_CI-CD/debian-stable-php-fpm/tekton.yaml
@@ -20,4 +20,4 @@ spec:
       - name: git-source
         persistentVolumeClaim:
           claimName: tektoncd-workspaces
-        subPath: usr_src/tekton-debian-stable-php-fpm
\ No newline at end of file
+        subPath: tekton/debian-stable-php-fpm
\ No newline at end of file
diff --git a/_CI-CD/debian-stable/tekton.yaml b/_CI-CD/debian-stable/tekton.yaml
index 939542f..a7fa400 100644
--- a/_CI-CD/debian-stable/tekton.yaml
+++ b/_CI-CD/debian-stable/tekton.yaml
@@ -20,4 +20,4 @@ spec:
       - name: git-source
         persistentVolumeClaim:
           claimName: tektoncd-workspaces
-        subPath: usr_src/tekton-debian-stable
\ No newline at end of file
+        subPath: tekton/debian-stable
\ No newline at end of file
diff --git a/_CI-CD/debian-testing/tekton.yaml b/_CI-CD/debian-testing/tekton.yaml
index c69956b..997e598 100644
--- a/_CI-CD/debian-testing/tekton.yaml
+++ b/_CI-CD/debian-testing/tekton.yaml
@@ -20,4 +20,4 @@ spec:
       - name: git-source
         persistentVolumeClaim:
           claimName: tektoncd-workspaces
-        subPath: usr_src/tekton-debian-testing
\ No newline at end of file
+        subPath: tekton/debian-testing
\ No newline at end of file
diff --git a/_CI-CD/distcc/tekton-image-build.yaml b/_CI-CD/distcc/tekton-image-build.yaml
deleted file mode 100644
index c40f49a..0000000
--- a/_CI-CD/distcc/tekton-image-build.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-apiVersion: tekton.dev/v1alpha1
-kind: PipelineResource
-metadata:
-  name: chaos-kubernetes-git
-spec:
-  type: git
-  params:
-    - name: revision
-      value: master
-    - name: url
-      value: http://git-ui.lan/chaos/kubernetes.git
-    - name: submodules
-      value: "false"
----
-apiVersion: tekton.dev/v1alpha1
-kind: PipelineResource
-metadata:
-  name: img-distcc
-spec:
-  type: image
-  params:
-    - name: url
-      value: cr.lan/distcc
----
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: build-distcc
-spec:
-  params:
-    - name: pathToDockerFile
-      type: string
-      default: $(resources.inputs.source.path)/apps/distcc/Dockerfile
-    - name: pathToContext
-      type: string
-      default: $(resources.inputs.source.path)/apps/distcc
-  resources:
-    inputs:
-      - name: source
-        type: git
-    outputs:
-      - name: builtImage
-        type: image
-  steps:
-    - name: build-and-push
-      image: gcr.io/kaniko-project/executor:arm64
-      command:
-        - /kaniko/executor
-      args:
-        - --dockerfile=$(params.pathToDockerFile)
-        - --destination=$(resources.outputs.builtImage.url)
-        - --context=$(params.pathToContext)
-        - --skip-tls-verify
----
-apiVersion: tekton.dev/v1beta1
-kind: TaskRun
-metadata:
-  name: img-distcc
-spec:
-  #serviceAccountName: dockerhub-service
-  taskRef:
-    name: build-distcc
-  params:
-    - name: pathToDockerFile
-      value: Dockerfile
-  resources:
-    inputs:
-      - name: source
-        resourceRef:
-          name: chaos-kubernetes-git
-    outputs:
-      - name: builtImage
-        resourceRef:
-          name: img-distcc
-          
-          
\ No newline at end of file
diff --git a/_CI-CD/distcc/tekton.yaml b/_CI-CD/distcc/tekton.yaml
new file mode 100644
index 0000000..0b52049
--- /dev/null
+++ b/_CI-CD/distcc/tekton.yaml
@@ -0,0 +1,23 @@
+apiVersion: tekton.dev/v1beta1
+kind: PipelineRun
+metadata:
+  name: img-distcc
+spec:
+  pipelineRef:
+    name: kaniko-pipeline
+  params:
+    - name: git-url
+      value: http://git-ui.lan/chaos/kubernetes.git
+    - name: git-revision
+      value: master
+    - name: path-to-image-context
+      value: _CI-CD/distcc
+    - name: path-to-dockerfile
+      value: _CI-CD/distcc/Dockerfile
+    - name: image-name
+      value: cr.lan/distcc
+  workspaces:
+      - name: git-source
+        persistentVolumeClaim:
+          claimName: tektoncd-workspaces
+        subPath: tekton/distcc
\ No newline at end of file
diff --git a/_CI-CD/tektoncd-kaniko-task.yaml b/_CI-CD/tektoncd-kaniko-task.yaml
index 2879b19..47ed0f9 100644
--- a/_CI-CD/tektoncd-kaniko-task.yaml
+++ b/_CI-CD/tektoncd-kaniko-task.yaml
@@ -57,6 +57,8 @@ spec:
     - --destination=$(params.IMAGE)
     - --digest-file=/tekton/results/IMAGE-DIGEST
     - --snapshotMode=redo
+    - --single-snapshot
+    - --use-new-run
     - --skip-tls-verify
     # kaniko assumes it is running as root, which means this example fails on platforms
     # that default to run containers as random uid (like OpenShift). Adding this securityContext
diff --git a/apps/rompr/tekton.yaml b/apps/rompr/tekton.yaml
index 00a30db..58b9d74 100644
--- a/apps/rompr/tekton.yaml
+++ b/apps/rompr/tekton.yaml
@@ -20,4 +20,4 @@ spec:
       - name: git-source
         persistentVolumeClaim:
           claimName: tektoncd-workspaces
-        subPath: usr_src/tekton-kaniko-pipelines
\ No newline at end of file
+        subPath: tekton/kaniko-pipelines
\ No newline at end of file