diff --git a/.konflux/applications/serverless-operator-135/tests/override-snapshot-ec-test.yaml b/.konflux/applications/serverless-operator-135/tests/override-snapshot-ec-test.yaml
index fb1de286c..18e240e0b 100755
--- a/.konflux/applications/serverless-operator-135/tests/override-snapshot-ec-test.yaml
+++ b/.konflux/applications/serverless-operator-135/tests/override-snapshot-ec-test.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   params: 
     - name: POLICY_CONFIGURATION
-      value: rhtap-releng-tenant/registry-standard
+      value: rhtap-releng-tenant/registry-ocp-serverless-prod
     - name: TIMEOUT
       value: "120m"
   application: serverless-operator-135
diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml
index aab9f23de..3003ed450 100755
--- a/.tekton/docker-build.yaml
+++ b/.tekton/docker-build.yaml
@@ -138,7 +138,7 @@ spec:
       - name: name
         value: sast-snyk-check-oci-ta
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.3@sha256:6d232347739a0366dcfc4e40afbcb5d1937dd3fea8952afb1bd6a4b0c5d1c1f5
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta@sha256:af93b35e6e71a6ff7f3785ad8d8497b11204a5c0c33ab1a78b44f9d43f49c7a5
       - name: kind
         value: task
       resolver: bundles
@@ -356,7 +356,7 @@ spec:
       - name: name
         value: deprecated-image-check
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:f8efb0b22692fad908a1a75f8d5c0b6ed3b0bcd2a9853577e7be275e5bac1bb8
+        value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check@sha256:650330fde0773f73f6bac77ae573031c44c79165d9503b0d5ec1db3e6ef981d7
       - name: kind
         value: task
       resolver: bundles
@@ -378,7 +378,7 @@ spec:
       - name: name
         value: clair-scan
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:e428b37d253621365ffb24d4053e5f3141988ae6a30fce1c8ba73b7211396eb0
+        value: quay.io/konflux-ci/tekton-catalog/task-clair-scan@sha256:907f11c67b0330480cbf85c23b1085acc5a049ab90af980169251860a3d97ef7
       - name: kind
         value: task
       resolver: bundles
@@ -420,7 +420,7 @@ spec:
       - name: name
         value: clamav-scan
       - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:d78221853f7ff2befc6669dd0eeb91e6611ae84ac7754150ea0f071d92ff41cb
+        value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan@sha256:c12e7a774bb07ad2796c01071b0dc0f199111b0ee99c45b55fa599e23b200bae
       - name: kind
         value: task
       resolver: bundles
@@ -446,7 +446,7 @@ spec:
       - 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:ac6a35e4143a68f841e363da3f21f2123de9f3acf76596f79ecb60c501eed408
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta@sha256:7553ec6925d0586b286502669b8e31a39dc73501f657426bac99019ac598d6ab
       - name: kind
         value: task
       resolver: bundles
@@ -470,7 +470,7 @@ spec:
       - 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:ac6a35e4143a68f841e363da3f21f2123de9f3acf76596f79ecb60c501eed408
+        value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta@sha256:7553ec6925d0586b286502669b8e31a39dc73501f657426bac99019ac598d6ab
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/kn-plugin-func-func-util-115-pull-request.yaml b/.tekton/kn-plugin-func-func-util-115-pull-request.yaml
index 4a6dc907d..0a3cfa2a9 100755
--- a/.tekton/kn-plugin-func-func-util-115-pull-request.yaml
+++ b/.tekton/kn-plugin-func-func-util-115-pull-request.yaml
@@ -21,11 +21,11 @@ spec:
       value: openshift/ci-operator/knative-images/func-util/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.35.0
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
+        - VERSION=1.35.0
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-plugin-func-func-util-115-push.yaml b/.tekton/kn-plugin-func-func-util-115-push.yaml
index 51f7e0ade..45a0ad52b 100755
--- a/.tekton/kn-plugin-func-func-util-115-push.yaml
+++ b/.tekton/kn-plugin-func-func-util-115-push.yaml
@@ -20,11 +20,11 @@ spec:
       value: openshift/ci-operator/knative-images/func-util/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.35.0
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
+        - VERSION=1.35.0
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic