diff --git a/.github/workflows/multiarch-build.yaml b/.github/workflows/multiarch-build.yaml
deleted file mode 100644
index e82205b53..000000000
--- a/.github/workflows/multiarch-build.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Multiarch builds
-
-on:
-  push:
-    branches-ignore:    
-      - 'main'
-      - 'ci/*'
-
-jobs:
-  build-image:
-    name: Build image
-    uses: openshift-knative/hack/.github/workflows/multiarch-containerfile-build.yaml@main
-    secrets: inherit
-    strategy:
-      matrix:
-        image:
-        - eventshub
-        - wathola-forwarder
-    with:
-      image: ${{ matrix.image }}
-      containerfile: openshift/ci-operator/test-images/${{ matrix.image }}/Dockerfile
diff --git a/.konflux/applications/serverless-operator-136/components/kn-plugin-event-sender-116.yaml b/.konflux/applications/serverless-operator-136/components/kn-plugin-event-sender-116.yaml
index 10869a4af..6dfd6b342 100755
--- a/.konflux/applications/serverless-operator-136/components/kn-plugin-event-sender-116.yaml
+++ b/.konflux/applications/serverless-operator-136/components/kn-plugin-event-sender-116.yaml
@@ -9,6 +9,11 @@ spec:
   componentName: kn-plugin-event-sender-116
   application: serverless-operator-136
    
+  build-nudges-ref:
+    
+    - "serverless-bundle-136"
+    
+  
   source:
     git:
       url: https://github.com/openshift-knative/kn-plugin-event.git
diff --git a/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-eventshub-116.yaml b/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-eventshub-116.yaml
index 4ca9f3ca0..39ba88eaf 100755
--- a/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-eventshub-116.yaml
+++ b/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-eventshub-116.yaml
@@ -9,6 +9,11 @@ spec:
   componentName: kn-plugin-event-test-eventshub-116
   application: serverless-operator-136
    
+  build-nudges-ref:
+    
+    - "serverless-bundle-136"
+    
+  
   source:
     git:
       url: https://github.com/openshift-knative/kn-plugin-event.git
diff --git a/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-wathola-forwarder-116.yaml b/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-wathola-forwarder-116.yaml
index 574e0d3ea..56039bf44 100755
--- a/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-wathola-forwarder-116.yaml
+++ b/.konflux/applications/serverless-operator-136/components/kn-plugin-event-test-wathola-forwarder-116.yaml
@@ -9,6 +9,11 @@ spec:
   componentName: kn-plugin-event-test-wathola-forwarder-116
   application: serverless-operator-136
    
+  build-nudges-ref:
+    
+    - "serverless-bundle-136"
+    
+  
   source:
     git:
       url: https://github.com/openshift-knative/kn-plugin-event.git
diff --git a/.konflux/applications/serverless-operator-136/tests/ec-test.yaml b/.konflux/applications/serverless-operator-136/tests/ec-test.yaml
index 57202cc24..5b29ed6f4 100755
--- a/.konflux/applications/serverless-operator-136/tests/ec-test.yaml
+++ b/.konflux/applications/serverless-operator-136/tests/ec-test.yaml
@@ -1,7 +1,7 @@
 apiVersion: appstudio.redhat.com/v1beta2
 kind: IntegrationTestScenario
 metadata:
-  name: serverless-operator-136-enterprise-contract
+  name: serverless-operator-136-ec
 spec:
   params: 
     - name: POLICY_CONFIGURATION
diff --git a/.konflux/applications/serverless-operator-136/tests/override-snapshot-ec-test.yaml b/.konflux/applications/serverless-operator-136/tests/override-snapshot-ec-test.yaml
new file mode 100755
index 000000000..a1b14a3c4
--- /dev/null
+++ b/.konflux/applications/serverless-operator-136/tests/override-snapshot-ec-test.yaml
@@ -0,0 +1,23 @@
+apiVersion: appstudio.redhat.com/v1beta2
+kind: IntegrationTestScenario
+metadata:
+  name: serverless-operator-136-ec-override-snapshot
+spec:
+  params: 
+    - name: POLICY_CONFIGURATION
+      value: rhtap-releng-tenant/registry-standard
+    - name: TIMEOUT
+      value: "120m"
+  application: serverless-operator-136
+  contexts:
+    - description: Override Snapshot testing
+      name: override
+  resolverRef:
+    params:
+      - name: url
+        value: 'https://github.com/redhat-appstudio/build-definitions'
+      - name: revision
+        value: main
+      - name: pathInRepo
+        value: pipelines/enterprise-contract.yaml
+    resolver: git
diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml
index cd816c07e..471cafd5d 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