diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml
index 104977b14f09..7b7e976f1211 100755
--- a/.tekton/docker-build.yaml
+++ b/.tekton/docker-build.yaml
@@ -429,6 +429,56 @@ spec:
       operator: in
       values:
       - "false"
+  - name: sast-shell-check
+    params:
+    - name: image-digest
+      value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+    - name: image-url
+      value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: SOURCE_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
+    - name: CACHI2_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
+    runAfter:
+    - build-image-index
+    taskRef:
+      params:
+      - name: name
+        value: sast-shell-check-oci-ta
+      - name: bundle
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e1049e55bdd8cf16fba605285a58bd6f61f95694e84b3fffe5d9191417263266
+      - name: kind
+        value: task
+      resolver: bundles
+    when:
+    - input: $(params.skip-checks)
+      operator: in
+      values:
+      - "false"
+  - name: sast-unicode-check
+    params:
+    - name: image-url
+      value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: SOURCE_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
+    - name: CACHI2_ARTIFACT
+      value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
+    runAfter:
+    - build-image-index
+    taskRef:
+      params:
+      - name: name
+        value: sast-shell-check-oci-ta
+      - name: bundle
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:e1049e55bdd8cf16fba605285a58bd6f61f95694e84b3fffe5d9191417263266
+      - name: kind
+        value: task
+      resolver: bundles
+    when:
+    - input: $(params.skip-checks)
+      operator: in
+      values:
+      - "false"
   - name: push-dockerfile
     params:
     - name: IMAGE
diff --git a/.tekton/kn-serving-activator-115-push.yaml b/.tekton/kn-serving-activator-115-push.yaml
index 8dadd611e39f..d43a839be623 100755
--- a/.tekton/kn-serving-activator-115-push.yaml
+++ b/.tekton/kn-serving-activator-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-autoscaler-115-push.yaml b/.tekton/kn-serving-autoscaler-115-push.yaml
index e14093ff173c..1d958cc6132f 100755
--- a/.tekton/kn-serving-autoscaler-115-push.yaml
+++ b/.tekton/kn-serving-autoscaler-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-autoscaler-hpa-115-push.yaml b/.tekton/kn-serving-autoscaler-hpa-115-push.yaml
index 15cc8bfd7d81..3dbc82937088 100755
--- a/.tekton/kn-serving-autoscaler-hpa-115-push.yaml
+++ b/.tekton/kn-serving-autoscaler-hpa-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-cleanup-115-push.yaml b/.tekton/kn-serving-cleanup-115-push.yaml
index 4d89d269f963..13f582273a6e 100755
--- a/.tekton/kn-serving-cleanup-115-push.yaml
+++ b/.tekton/kn-serving-cleanup-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-controller-115-push.yaml b/.tekton/kn-serving-controller-115-push.yaml
index 12dbefac2508..f0be9f1178bf 100755
--- a/.tekton/kn-serving-controller-115-push.yaml
+++ b/.tekton/kn-serving-controller-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-dataplane-probe-115-push.yaml b/.tekton/kn-serving-dataplane-probe-115-push.yaml
index a21a305cc7e3..5a70f5dd63b5 100755
--- a/.tekton/kn-serving-dataplane-probe-115-push.yaml
+++ b/.tekton/kn-serving-dataplane-probe-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-default-domain-115-push.yaml b/.tekton/kn-serving-default-domain-115-push.yaml
index c5ad4de2a4fb..9c20ae457c6f 100755
--- a/.tekton/kn-serving-default-domain-115-push.yaml
+++ b/.tekton/kn-serving-default-domain-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-load-test-115-push.yaml b/.tekton/kn-serving-load-test-115-push.yaml
index 8249c2180ebd..0bd92030521e 100755
--- a/.tekton/kn-serving-load-test-115-push.yaml
+++ b/.tekton/kn-serving-load-test-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-queue-115-push.yaml b/.tekton/kn-serving-queue-115-push.yaml
index 1e0c9fed2051..ab3ca1c8b3a2 100755
--- a/.tekton/kn-serving-queue-115-push.yaml
+++ b/.tekton/kn-serving-queue-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-real-traffic-test-115-push.yaml b/.tekton/kn-serving-real-traffic-test-115-push.yaml
index 7e5c49ee2e1d..5251603c4b16 100755
--- a/.tekton/kn-serving-real-traffic-test-115-push.yaml
+++ b/.tekton/kn-serving-real-traffic-test-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-reconciliation-delay-115-push.yaml b/.tekton/kn-serving-reconciliation-delay-115-push.yaml
index a25661c4f262..c1e4b79d2a9a 100755
--- a/.tekton/kn-serving-reconciliation-delay-115-push.yaml
+++ b/.tekton/kn-serving-reconciliation-delay-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-rollout-probe-115-push.yaml b/.tekton/kn-serving-rollout-probe-115-push.yaml
index 324e4b08a8ed..1085d0b248b6 100755
--- a/.tekton/kn-serving-rollout-probe-115-push.yaml
+++ b/.tekton/kn-serving-rollout-probe-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-scale-from-zero-115-push.yaml b/.tekton/kn-serving-scale-from-zero-115-push.yaml
index 99d6b443a22b..0e797a784d1e 100755
--- a/.tekton/kn-serving-scale-from-zero-115-push.yaml
+++ b/.tekton/kn-serving-scale-from-zero-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-storage-version-migration-115-push.yaml b/.tekton/kn-serving-storage-version-migration-115-push.yaml
index d2a007a86bb1..f934987f1392 100755
--- a/.tekton/kn-serving-storage-version-migration-115-push.yaml
+++ b/.tekton/kn-serving-storage-version-migration-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-autoscale-115-push.yaml b/.tekton/kn-serving-test-autoscale-115-push.yaml
index a4ac2d9e83ae..b32cd5e6be6d 100755
--- a/.tekton/kn-serving-test-autoscale-115-push.yaml
+++ b/.tekton/kn-serving-test-autoscale-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-failing-115-push.yaml b/.tekton/kn-serving-test-failing-115-push.yaml
index 06da08803acc..c59c0f095085 100755
--- a/.tekton/kn-serving-test-failing-115-push.yaml
+++ b/.tekton/kn-serving-test-failing-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-grpc-ping-115-push.yaml b/.tekton/kn-serving-test-grpc-ping-115-push.yaml
index 32569408f590..cf983f81f52a 100755
--- a/.tekton/kn-serving-test-grpc-ping-115-push.yaml
+++ b/.tekton/kn-serving-test-grpc-ping-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-hellohttp2-115-push.yaml b/.tekton/kn-serving-test-hellohttp2-115-push.yaml
index ca85c2bf5d0b..6f8083081236 100755
--- a/.tekton/kn-serving-test-hellohttp2-115-push.yaml
+++ b/.tekton/kn-serving-test-hellohttp2-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-hellovolume-115-push.yaml b/.tekton/kn-serving-test-hellovolume-115-push.yaml
index 32dad01184cb..ec162c5ccc48 100755
--- a/.tekton/kn-serving-test-hellovolume-115-push.yaml
+++ b/.tekton/kn-serving-test-hellovolume-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-helloworld-115-push.yaml b/.tekton/kn-serving-test-helloworld-115-push.yaml
index 2afd0f90bcde..ee2e344ebd26 100755
--- a/.tekton/kn-serving-test-helloworld-115-push.yaml
+++ b/.tekton/kn-serving-test-helloworld-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-httpproxy-115-push.yaml b/.tekton/kn-serving-test-httpproxy-115-push.yaml
index 3078c54f8cf1..69a1bb5cd3f2 100755
--- a/.tekton/kn-serving-test-httpproxy-115-push.yaml
+++ b/.tekton/kn-serving-test-httpproxy-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-pizzaplanetv1-115-push.yaml b/.tekton/kn-serving-test-pizzaplanetv1-115-push.yaml
index cb8e1ab092ad..86b7486eb7a1 100755
--- a/.tekton/kn-serving-test-pizzaplanetv1-115-push.yaml
+++ b/.tekton/kn-serving-test-pizzaplanetv1-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-pizzaplanetv2-115-push.yaml b/.tekton/kn-serving-test-pizzaplanetv2-115-push.yaml
index e02016f610f3..c8272375f420 100755
--- a/.tekton/kn-serving-test-pizzaplanetv2-115-push.yaml
+++ b/.tekton/kn-serving-test-pizzaplanetv2-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-readiness-115-push.yaml b/.tekton/kn-serving-test-readiness-115-push.yaml
index 51e3349d4fc9..476a17d087c5 100755
--- a/.tekton/kn-serving-test-readiness-115-push.yaml
+++ b/.tekton/kn-serving-test-readiness-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-revisionfailure-115-push.yaml b/.tekton/kn-serving-test-revisionfailure-115-push.yaml
index 0bcc5f23c477..c3a535cf18ea 100755
--- a/.tekton/kn-serving-test-revisionfailure-115-push.yaml
+++ b/.tekton/kn-serving-test-revisionfailure-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-runtime-115-push.yaml b/.tekton/kn-serving-test-runtime-115-push.yaml
index 66f3c3009e26..9782a255bae0 100755
--- a/.tekton/kn-serving-test-runtime-115-push.yaml
+++ b/.tekton/kn-serving-test-runtime-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-servingcontainer-115-push.yaml b/.tekton/kn-serving-test-servingcontainer-115-push.yaml
index 6a3810f294c4..d6aef266b3d1 100755
--- a/.tekton/kn-serving-test-servingcontainer-115-push.yaml
+++ b/.tekton/kn-serving-test-servingcontainer-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-sidecarcontainer-115-push.yaml b/.tekton/kn-serving-test-sidecarcontainer-115-push.yaml
index 4b7ee9439fa6..bb04cc6bc294 100755
--- a/.tekton/kn-serving-test-sidecarcontainer-115-push.yaml
+++ b/.tekton/kn-serving-test-sidecarcontainer-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-singlethreaded-115-push.yaml b/.tekton/kn-serving-test-singlethreaded-115-push.yaml
index eae6abeec658..2b94c2a274f7 100755
--- a/.tekton/kn-serving-test-singlethreaded-115-push.yaml
+++ b/.tekton/kn-serving-test-singlethreaded-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-slowstart-115-push.yaml b/.tekton/kn-serving-test-slowstart-115-push.yaml
index 68f4828bc27e..1f27928d0172 100755
--- a/.tekton/kn-serving-test-slowstart-115-push.yaml
+++ b/.tekton/kn-serving-test-slowstart-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-timeout-115-push.yaml b/.tekton/kn-serving-test-timeout-115-push.yaml
index 85ae7445bf8d..c6ce07577a11 100755
--- a/.tekton/kn-serving-test-timeout-115-push.yaml
+++ b/.tekton/kn-serving-test-timeout-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-volumes-115-push.yaml b/.tekton/kn-serving-test-volumes-115-push.yaml
index 0c2032578dd7..3007eac7611f 100755
--- a/.tekton/kn-serving-test-volumes-115-push.yaml
+++ b/.tekton/kn-serving-test-volumes-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-test-wsserver-115-push.yaml b/.tekton/kn-serving-test-wsserver-115-push.yaml
index 4d41b8e59ce4..20ce5d35ee0b 100755
--- a/.tekton/kn-serving-test-wsserver-115-push.yaml
+++ b/.tekton/kn-serving-test-wsserver-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef:
diff --git a/.tekton/kn-serving-webhook-115-push.yaml b/.tekton/kn-serving-webhook-115-push.yaml
index 700b8c98ea9f..c842c0611455 100755
--- a/.tekton/kn-serving-webhook-115-push.yaml
+++ b/.tekton/kn-serving-webhook-115-push.yaml
@@ -35,6 +35,7 @@ spec:
       value: '{{revision}}'
     - name: additional-tags
       value:
+        - $(context.pipelineRun.uid)-{{revision}}
         - 1.35.0
         - latest
   pipelineRef: