diff --git a/.github/workflows/dependabot-deps.yaml b/.github/workflows/dependabot-deps.yaml
index 08b73f2a93..4573a188a0 100644
--- a/.github/workflows/dependabot-deps.yaml
+++ b/.github/workflows/dependabot-deps.yaml
@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.head_ref }}
           path: ./src/github.com/${{ github.repository }}
diff --git a/.tekton/bundle-build.yaml b/.tekton/bundle-build.yaml
index 7e38abd054..a133b24381 100755
--- a/.tekton/bundle-build.yaml
+++ b/.tekton/bundle-build.yaml
@@ -1,7 +1,6 @@
 apiVersion: tekton.dev/v1
 kind: Pipeline
 metadata:
-  creationTimestamp: null
   labels:
     pipelines.openshift.io/runtime: generic
     pipelines.openshift.io/strategy: docker
@@ -13,20 +12,6 @@ spec:
 
     _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
     This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_
-  finally:
-  - name: show-sbom
-    params:
-    - name: IMAGE_URL
-      value: $(tasks.build-image-index.results.IMAGE_URL)
-    taskRef:
-      params:
-      - name: name
-        value: show-sbom
-      - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
-      - name: kind
-        value: task
-      resolver: bundles
   params:
   - default: "false"
     description: Add built image into an OCI image index
@@ -68,10 +53,6 @@ spec:
       path-context
     name: dockerfile
     type: string
-  - default: "false"
-    description: Force rebuild image
-    name: rebuild
-    type: string
   - default: "false"
     description: Skip checks against built image
     name: skip-checks
@@ -81,7 +62,7 @@ spec:
     name: hermetic
     type: string
   - default: ""
-    description: Build dependencies to be prefetched by Cachi2
+    description: Build dependencies to be prefetched
     name: prefetch-input
     type: string
   - default: ""
@@ -89,6 +70,14 @@ spec:
       2d, 3w for hours, days, and weeks, respectively.
     name: image-expires-after
     type: string
+  - default: docker
+    description: The format for the resulting image's mediaType. Valid values are
+      oci or docker.
+    name: buildah-format
+    type: string
+  - default: "false"
+    description: Enable cache proxy configuration
+    name: enable-cache-proxy
   - default: []
     description: Array of --build-arg values ("arg=value" strings) for buildah
     name: build-args
@@ -152,6 +141,14 @@ spec:
       value: $(params.build-args-file)
     - name: PRIVILEGED_NESTED
       value: $(params.privileged-nested)
+    - name: SOURCE_URL
+      value: $(tasks.clone-repository.results.url)
+    - name: BUILDAH_FORMAT
+      value: $(params.buildah-format)
+    - name: HTTP_PROXY
+      value: $(tasks.init.results.http-proxy)
+    - name: NO_PROXY
+      value: $(tasks.init.results.no-proxy)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
@@ -167,11 +164,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: sast-snyk-check
     params:
     - name: ARGS
@@ -249,12 +241,8 @@ spec:
       resolver: bundles
   - name: init
     params:
-    - name: image-url
-      value: $(params.output-image)
-    - name: rebuild
-      value: $(params.rebuild)
-    - name: skip-checks
-      value: $(params.skip-checks)
+    - name: enable-cache-proxy
+      value: $(params.enable-cache-proxy)
     taskRef:
       params:
       - name: name
@@ -285,11 +273,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
     workspaces:
     - name: basic-auth
       workspace: git-auth
@@ -297,15 +280,13 @@ spec:
     params:
     - name: IMAGE
       value: $(params.output-image)
-    - name: COMMIT_SHA
-      value: $(tasks.clone-repository.results.commit)
-    - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
     - name: ALWAYS_BUILD_INDEX
       value: $(params.build-image-index)
     - name: IMAGES
       value:
       - $(tasks.build-images.results.IMAGE_REF[*])
+    - name: BUILDAH_FORMAT
+      value: $(params.buildah-format)
     runAfter:
     - build-images
     taskRef:
@@ -317,11 +298,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: build-source-image
     params:
     - name: BINARY_IMAGE
@@ -344,10 +320,6 @@ spec:
         value: task
       resolver: bundles
     when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
     - input: $(params.build-source-image)
       operator: in
       values:
@@ -428,11 +400,6 @@ spec:
       operator: in
       values:
       - "false"
-    matrix:
-      params:
-      - name: image-arch
-        value:
-        - $(params.build-platforms)
   - name: sast-shell-check
     params:
     - name: image-digest
@@ -521,7 +488,7 @@ spec:
       - name: name
         value: rpms-signature-scan
       - name: bundle
-        value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:098297ee2cd66da57c050d88024b6f221f52af847ab36ca36748906de804adcd
+        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65b14e54b86c3b8e7332b53ff8d2e574693fa1335f9720aec21d47e9d15686f0
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml
index a704b4e317..9a0ffc2e6e 100755
--- a/.tekton/docker-build.yaml
+++ b/.tekton/docker-build.yaml
@@ -1,7 +1,6 @@
 apiVersion: tekton.dev/v1
 kind: Pipeline
 metadata:
-  creationTimestamp: null
   labels:
     pipelines.openshift.io/runtime: generic
     pipelines.openshift.io/strategy: docker
@@ -13,20 +12,6 @@ spec:
 
     _Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
     This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_
-  finally:
-  - name: show-sbom
-    params:
-    - name: IMAGE_URL
-      value: $(tasks.build-image-index.results.IMAGE_URL)
-    taskRef:
-      params:
-      - name: name
-        value: show-sbom
-      - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
-      - name: kind
-        value: task
-      resolver: bundles
   params:
   - default:
     - linux/x86_64
@@ -73,10 +58,6 @@ spec:
       path-context
     name: dockerfile
     type: string
-  - default: "false"
-    description: Force rebuild image
-    name: rebuild
-    type: string
   - default: "false"
     description: Skip checks against built image
     name: skip-checks
@@ -86,7 +67,7 @@ spec:
     name: hermetic
     type: string
   - default: ""
-    description: Build dependencies to be prefetched by Cachi2
+    description: Build dependencies to be prefetched
     name: prefetch-input
     type: string
   - default: ""
@@ -98,6 +79,14 @@ spec:
     description: Add built image into an OCI image index
     name: build-image-index
     type: string
+  - default: docker
+    description: The format for the resulting image's mediaType. Valid values are
+      oci or docker.
+    name: buildah-format
+    type: string
+  - default: "false"
+    description: Enable cache proxy configuration
+    name: enable-cache-proxy
   - default: []
     description: Array of --build-arg values ("arg=value" strings) for buildah
     name: build-args
@@ -202,12 +191,8 @@ spec:
       resolver: bundles
   - name: init
     params:
-    - name: image-url
-      value: $(params.output-image)
-    - name: rebuild
-      value: $(params.rebuild)
-    - name: skip-checks
-      value: $(params.skip-checks)
+    - name: enable-cache-proxy
+      value: $(params.enable-cache-proxy)
     taskRef:
       params:
       - name: name
@@ -238,11 +223,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
     workspaces:
     - name: basic-auth
       workspace: git-auth
@@ -274,6 +254,14 @@ spec:
       value: $(params.build-args-file)
     - name: PRIVILEGED_NESTED
       value: $(params.privileged-nested)
+    - name: SOURCE_URL
+      value: $(tasks.clone-repository.results.url)
+    - name: BUILDAH_FORMAT
+      value: $(params.buildah-format)
+    - name: HTTP_PROXY
+      value: $(tasks.init.results.http-proxy)
+    - name: NO_PROXY
+      value: $(tasks.init.results.no-proxy)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
@@ -291,24 +279,17 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: build-image-index
     params:
     - name: IMAGE
       value: $(params.output-image)
-    - name: COMMIT_SHA
-      value: $(tasks.clone-repository.results.commit)
-    - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
     - name: ALWAYS_BUILD_INDEX
       value: $(params.build-image-index)
     - name: IMAGES
       value:
       - $(tasks.build-images.results.IMAGE_REF[*])
+    - name: BUILDAH_FORMAT
+      value: $(params.buildah-format)
     runAfter:
     - build-images
     taskRef:
@@ -320,11 +301,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: build-source-image
     params:
     - name: BINARY_IMAGE
@@ -347,10 +323,6 @@ spec:
         value: task
       resolver: bundles
     when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
     - input: $(params.build-source-image)
       operator: in
       values:
@@ -404,7 +376,12 @@ spec:
       operator: in
       values:
       - "false"
-  - name: ecosystem-cert-preflight-checks
+  - matrix:
+      params:
+      - name: platform
+        value:
+        - $(params.build-platforms)
+    name: ecosystem-cert-preflight-checks
     params:
     - name: image-url
       value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -429,11 +406,6 @@ spec:
       - name: image-arch
         value:
         - $(params.build-platforms)
-    matrix:
-      params:
-      - name: platform
-        value:
-        - $(params.build-platforms)
     name: clamav-scan
     params:
     - name: image-digest
@@ -456,11 +428,6 @@ spec:
       operator: in
       values:
       - "false"
-    matrix:
-      params:
-      - name: image-arch
-        value:
-        - $(params.build-platforms)
   - name: sast-shell-check
     params:
     - name: image-digest
@@ -549,7 +516,7 @@ spec:
       - name: name
         value: rpms-signature-scan
       - name: bundle
-        value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:098297ee2cd66da57c050d88024b6f221f52af847ab36ca36748906de804adcd
+        value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65b14e54b86c3b8e7332b53ff8d2e574693fa1335f9720aec21d47e9d15686f0
       - name: kind
         value: task
       resolver: bundles
diff --git a/.tekton/fbc-builder.yaml b/.tekton/fbc-builder.yaml
index d3d1795abd..5e91cf9c5d 100755
--- a/.tekton/fbc-builder.yaml
+++ b/.tekton/fbc-builder.yaml
@@ -1,7 +1,6 @@
 apiVersion: tekton.dev/v1
 kind: Pipeline
 metadata:
-  creationTimestamp:
   labels:
     pipelines.openshift.io/runtime: fbc
     pipelines.openshift.io/strategy: fbc
@@ -13,33 +12,37 @@ spec:
 
     _Uses `buildah` to create a container image. Its build-time tests are limited to verifying the included catalog and do not scan the image.
     This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-fbc-builder?tab=tags)_
-  finally:
-  - name: show-sbom
-    params:
-    - name: IMAGE_URL
-      value: $(tasks.build-image-index.results.IMAGE_URL)
-    taskRef:
-      params:
-      - name: name
-        value: show-sbom
-      - name: bundle
-        value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
-      - name: kind
-        value: task
-      resolver: bundles
   params:
   - default:
     - linux/x86_64
     - linux/arm64
     - linux/ppc64le
     - linux/s390x
-    description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
+    description: List of platforms to build the container images on. The available
+      set of values is determined by the configuration of the multi-platform-controller.
     name: build-platforms
     type: array
   - default: "true"
     description: Build a source image.
     name: build-source-image
     type: string
+  - default: []
+    description: Array of opm command arguments
+    name: opm-args
+    type: array
+  - default: ""
+    description: OPM output path
+    name: opm-output-path
+    type: string
+  - default: ""
+    description: Optional. Relative path to a file (e.g., catalog-template.yml) in
+      which pullspecs should be updated before running opm.
+    name: file-to-update-pullspec
+    type: string
+  - default: .tekton/images-mirror-set.yaml
+    description: Optional, path for ImageDigestMirrorSet file. It defaults to '.tekton/images-mirror-set.yaml'.
+    name: idms-path
+    type: string
   - default: []
     description: Additional image tags
     name: additional-tags
@@ -55,17 +58,15 @@ spec:
     name: output-image
     type: string
   - default: .
-    description: Path to the source code of an application's component from where to build image.
+    description: Path to the source code of an application's component from where
+      to build image.
     name: path-context
     type: string
   - default: Dockerfile
-    description: Path to the Dockerfile inside the context specified by parameter path-context
+    description: Path to the Dockerfile inside the context specified by parameter
+      path-context
     name: dockerfile
     type: string
-  - default: "false"
-    description: Force rebuild image
-    name: rebuild
-    type: string
   - default: "false"
     description: Skip checks against built image
     name: skip-checks
@@ -75,17 +76,21 @@ spec:
     name: hermetic
     type: string
   - default: ""
-    description: Build dependencies to be prefetched by Cachi2
+    description: Build dependencies to be prefetched
     name: prefetch-input
     type: string
   - default: ""
-    description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
+    description: Image tag expiration time, time values could be something like 1h,
+      2d, 3w for hours, days, and weeks, respectively.
     name: image-expires-after
     type: string
   - default: "true"
     description: Add built image into an OCI image index
     name: build-image-index
     type: string
+  - default: "false"
+    description: Enable cache proxy configuration
+    name: enable-cache-proxy
   - default: []
     description: Array of --build-arg values ("arg=value" strings) for buildah
     name: build-args
@@ -94,10 +99,6 @@ spec:
     description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file
     name: build-args-file
     type: string
-  - name: buildah-format
-    default: oci
-    type: string
-    description: The format for the resulting image's mediaType. Valid values are oci or docker.
   results:
   - description: ""
     name: IMAGE_URL
@@ -112,6 +113,34 @@ spec:
     name: CHAINS-GIT_COMMIT
     value: $(tasks.clone-repository.results.commit)
   tasks:
+  - name: run-opm-command
+    params:
+    - name: OPM_ARGS
+      value:
+      - $(params.opm-args[*])
+    - name: OPM_OUTPUT_PATH
+      value: $(params.opm-output-path)
+    - name: FILE_TO_UPDATE_PULLSPEC
+      value: $(params.file-to-update-pullspec)
+    - name: IDMS_PATH
+      value: $(params.idms-path)
+    - name: SOURCE_ARTIFACT
+      value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
+    - name: ociStorage
+      value: $(params.output-image).opm
+    - name: ociArtifactExpiresAfter
+      value: $(params.image-expires-after)
+    runAfter:
+    - clone-repository
+    taskRef:
+      params:
+      - name: name
+        value: run-opm-command-oci-ta
+      - name: bundle
+        value: quay.io/konflux-ci/tekton-catalog/task-run-opm-command-oci-ta:0.1@sha256:c79858b867713e44927438f6193c49004bf40bfd9248682f20c5a83ea2a9d2f1
+      - name: kind
+        value: task
+      resolver: bundles
   - name: apply-tags
     params:
     - name: ADDITIONAL_TAGS
@@ -133,12 +162,8 @@ spec:
       resolver: bundles
   - name: init
     params:
-    - name: image-url
-      value: $(params.output-image)
-    - name: rebuild
-      value: $(params.rebuild)
-    - name: skip-checks
-      value: $(params.skip-checks)
+    - name: enable-cache-proxy
+      value: $(params.enable-cache-proxy)
     taskRef:
       params:
       - name: name
@@ -169,11 +194,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
     workspaces:
     - name: basic-auth
       workspace: git-auth
@@ -182,13 +202,13 @@ spec:
     - name: input
       value: $(params.prefetch-input)
     - name: SOURCE_ARTIFACT
-      value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
+      value: $(tasks.run-opm-command.results.SOURCE_ARTIFACT)
     - name: ociStorage
       value: $(params.output-image).prefetch
     - name: ociArtifactExpiresAfter
       value: $(params.image-expires-after)
     runAfter:
-    - clone-repository
+    - run-opm-command
     taskRef:
       params:
       - name: name
@@ -229,14 +249,18 @@ spec:
       - $(params.build-args[*])
     - name: BUILD_ARGS_FILE
       value: $(params.build-args-file)
+    - name: SOURCE_URL
+      value: $(tasks.clone-repository.results.url)
+    - name: HTTP_PROXY
+      value: $(tasks.init.results.http-proxy)
+    - name: NO_PROXY
+      value: $(tasks.init.results.no-proxy)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
     - name: IMAGE_APPEND_PLATFORM
       value: "true"
-    - name: BUILDAH_FORMAT
-      value: $(params.buildah-format)
     runAfter:
     - clone-repository
     taskRef:
@@ -248,26 +272,15 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: build-image-index
     params:
     - name: IMAGE
       value: $(params.output-image)
-    - name: COMMIT_SHA
-      value: $(tasks.clone-repository.results.commit)
-    - name: IMAGE_EXPIRES_AFTER
-      value: $(params.image-expires-after)
     - name: ALWAYS_BUILD_INDEX
       value: $(params.build-image-index)
     - name: IMAGES
       value:
       - $(tasks.build-images.results.IMAGE_REF[*])
-    - name: BUILDAH_FORMAT
-      value: $(params.buildah-format)
     runAfter:
     - build-images
     taskRef:
@@ -279,11 +292,6 @@ spec:
       - name: kind
         value: task
       resolver: bundles
-    when:
-    - input: $(tasks.init.results.build)
-      operator: in
-      values:
-      - "true"
   - name: deprecated-base-image-check
     params:
     - name: IMAGE_URL
diff --git a/.tekton/serverless-bundle-136-pull-request.yaml b/.tekton/serverless-bundle-136-pull-request.yaml
index 90256be60a..812416448f 100755
--- a/.tekton/serverless-bundle-136-pull-request.yaml
+++ b/.tekton/serverless-bundle-136-pull-request.yaml
@@ -22,13 +22,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-bundle-136-push.yaml b/.tekton/serverless-bundle-136-push.yaml
index 5876c6f36a..6ad9895e0f 100755
--- a/.tekton/serverless-bundle-136-push.yaml
+++ b/.tekton/serverless-bundle-136-push.yaml
@@ -21,13 +21,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-index-136-fbc-414-pull-request.yaml b/.tekton/serverless-index-136-fbc-414-pull-request.yaml
index dc2018f009..b112e0c82c 100755
--- a/.tekton/serverless-index-136-fbc-414-pull-request.yaml
+++ b/.tekton/serverless-index-136-fbc-414-pull-request.yaml
@@ -24,13 +24,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
         - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.14
     - name: git-url
       value: '{{source_url}}'
@@ -45,6 +45,16 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.14/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.14/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.14/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-414-push.yaml b/.tekton/serverless-index-136-fbc-414-push.yaml
index bebba348e0..7bb6aa00e0 100755
--- a/.tekton/serverless-index-136-fbc-414-push.yaml
+++ b/.tekton/serverless-index-136-fbc-414-push.yaml
@@ -23,13 +23,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
         - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.14
     - name: git-url
       value: '{{source_url}}'
@@ -44,6 +44,16 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.36.1
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.14/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.14/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.14/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-415-pull-request.yaml b/.tekton/serverless-index-136-fbc-415-pull-request.yaml
index 5294f9f51f..dfc7b7bc03 100755
--- a/.tekton/serverless-index-136-fbc-415-pull-request.yaml
+++ b/.tekton/serverless-index-136-fbc-415-pull-request.yaml
@@ -24,14 +24,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.15
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.15
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -45,6 +45,16 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.15/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.15/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.15/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-415-push.yaml b/.tekton/serverless-index-136-fbc-415-push.yaml
index c48f75032a..62e17a437b 100755
--- a/.tekton/serverless-index-136-fbc-415-push.yaml
+++ b/.tekton/serverless-index-136-fbc-415-push.yaml
@@ -23,14 +23,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.15
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.15
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -44,6 +44,16 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.36.1
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.15/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.15/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.15/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-416-pull-request.yaml b/.tekton/serverless-index-136-fbc-416-pull-request.yaml
index 7949b58c64..a3be9a866e 100755
--- a/.tekton/serverless-index-136-fbc-416-pull-request.yaml
+++ b/.tekton/serverless-index-136-fbc-416-pull-request.yaml
@@ -24,14 +24,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.16
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -45,6 +45,16 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.16/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.16/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.16/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-416-push.yaml b/.tekton/serverless-index-136-fbc-416-push.yaml
index c0724fcac2..5cd438eabb 100755
--- a/.tekton/serverless-index-136-fbc-416-push.yaml
+++ b/.tekton/serverless-index-136-fbc-416-push.yaml
@@ -23,14 +23,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.16
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -44,6 +44,16 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.36.1
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.16/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.16/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.16/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-417-pull-request.yaml b/.tekton/serverless-index-136-fbc-417-pull-request.yaml
index 0088994038..1e45939697 100755
--- a/.tekton/serverless-index-136-fbc-417-pull-request.yaml
+++ b/.tekton/serverless-index-136-fbc-417-pull-request.yaml
@@ -24,14 +24,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.17
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -45,6 +45,17 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.17/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.17/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.17/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-417-push.yaml b/.tekton/serverless-index-136-fbc-417-push.yaml
index 9d0f8de66d..02a0983c0d 100755
--- a/.tekton/serverless-index-136-fbc-417-push.yaml
+++ b/.tekton/serverless-index-136-fbc-417-push.yaml
@@ -23,14 +23,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.17
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -44,6 +44,17 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.36.1
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.17/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.17/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.17/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-418-pull-request.yaml b/.tekton/serverless-index-136-fbc-418-pull-request.yaml
index 64dc7b3a8e..dc62bf28e3 100755
--- a/.tekton/serverless-index-136-fbc-418-pull-request.yaml
+++ b/.tekton/serverless-index-136-fbc-418-pull-request.yaml
@@ -24,14 +24,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.18
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -45,6 +45,17 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.18/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.18/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.18/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-418-push.yaml b/.tekton/serverless-index-136-fbc-418-push.yaml
index db77bfcd11..8b077caed3 100755
--- a/.tekton/serverless-index-136-fbc-418-push.yaml
+++ b/.tekton/serverless-index-136-fbc-418-push.yaml
@@ -23,14 +23,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.18
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -44,6 +44,17 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.36.1
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.18/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.18/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.18/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-419-pull-request.yaml b/.tekton/serverless-index-136-fbc-419-pull-request.yaml
index 5591c60eba..dc5b98c3e5 100755
--- a/.tekton/serverless-index-136-fbc-419-pull-request.yaml
+++ b/.tekton/serverless-index-136-fbc-419-pull-request.yaml
@@ -24,14 +24,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.19
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -45,6 +45,17 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.19/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.19/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.19/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-419-push.yaml b/.tekton/serverless-index-136-fbc-419-push.yaml
index 36788035e0..0c8ccea376 100755
--- a/.tekton/serverless-index-136-fbc-419-push.yaml
+++ b/.tekton/serverless-index-136-fbc-419-push.yaml
@@ -23,14 +23,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.19
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -44,6 +44,17 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.36.1
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.19/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.19/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.19/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-420-pull-request.yaml b/.tekton/serverless-index-136-fbc-420-pull-request.yaml
index 07030d0cc2..d29eebda0a 100755
--- a/.tekton/serverless-index-136-fbc-420-pull-request.yaml
+++ b/.tekton/serverless-index-136-fbc-420-pull-request.yaml
@@ -24,14 +24,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -45,6 +45,17 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.20/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.20/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.20/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-136-fbc-420-push.yaml b/.tekton/serverless-index-136-fbc-420-push.yaml
index 28a78b35d9..3732745da6 100755
--- a/.tekton/serverless-index-136-fbc-420-push.yaml
+++ b/.tekton/serverless-index-136-fbc-420-push.yaml
@@ -23,14 +23,14 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -44,6 +44,17 @@ spec:
         - $(context.pipelineRun.uid)-{{revision}}
         - 1.36.1
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.20/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.20/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.20/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-ingress-136-pull-request.yaml b/.tekton/serverless-ingress-136-pull-request.yaml
index 6a182b99f4..7168c3d83f 100755
--- a/.tekton/serverless-ingress-136-pull-request.yaml
+++ b/.tekton/serverless-ingress-136-pull-request.yaml
@@ -22,13 +22,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-ingress-136-push.yaml b/.tekton/serverless-ingress-136-push.yaml
index 29ce62e5d0..0e0c64a6c8 100755
--- a/.tekton/serverless-ingress-136-push.yaml
+++ b/.tekton/serverless-ingress-136-push.yaml
@@ -21,13 +21,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-kn-operator-136-pull-request.yaml b/.tekton/serverless-kn-operator-136-pull-request.yaml
index 2b31d857b6..a6976958e6 100755
--- a/.tekton/serverless-kn-operator-136-pull-request.yaml
+++ b/.tekton/serverless-kn-operator-136-pull-request.yaml
@@ -22,13 +22,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-kn-operator-136-push.yaml b/.tekton/serverless-kn-operator-136-push.yaml
index 7b626c3bff..93c587dc30 100755
--- a/.tekton/serverless-kn-operator-136-push.yaml
+++ b/.tekton/serverless-kn-operator-136-push.yaml
@@ -21,13 +21,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-metadata-webhook-136-pull-request.yaml b/.tekton/serverless-metadata-webhook-136-pull-request.yaml
index 5633abd0ce..033e3083c4 100755
--- a/.tekton/serverless-metadata-webhook-136-pull-request.yaml
+++ b/.tekton/serverless-metadata-webhook-136-pull-request.yaml
@@ -22,13 +22,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-metadata-webhook-136-push.yaml b/.tekton/serverless-metadata-webhook-136-push.yaml
index 96e9af2f3f..8a137bae20 100755
--- a/.tekton/serverless-metadata-webhook-136-push.yaml
+++ b/.tekton/serverless-metadata-webhook-136-push.yaml
@@ -21,13 +21,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-must-gather-136-pull-request.yaml b/.tekton/serverless-must-gather-136-pull-request.yaml
index 854978ca54..aab589cef6 100755
--- a/.tekton/serverless-must-gather-136-pull-request.yaml
+++ b/.tekton/serverless-must-gather-136-pull-request.yaml
@@ -22,13 +22,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-must-gather-136-push.yaml b/.tekton/serverless-must-gather-136-push.yaml
index 08755660a1..86778edd2b 100755
--- a/.tekton/serverless-must-gather-136-push.yaml
+++ b/.tekton/serverless-must-gather-136-push.yaml
@@ -21,13 +21,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-openshift-kn-operator-136-pull-request.yaml b/.tekton/serverless-openshift-kn-operator-136-pull-request.yaml
index ed245a199d..6917eff776 100755
--- a/.tekton/serverless-openshift-kn-operator-136-pull-request.yaml
+++ b/.tekton/serverless-openshift-kn-operator-136-pull-request.yaml
@@ -22,13 +22,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/serverless-openshift-kn-operator-136-push.yaml b/.tekton/serverless-openshift-kn-operator-136-push.yaml
index 0e744a1520..3d2cb40cb1 100755
--- a/.tekton/serverless-openshift-kn-operator-136-push.yaml
+++ b/.tekton/serverless-openshift-kn-operator-136-push.yaml
@@ -21,13 +21,13 @@ spec:
     - name: build-args
       value:
         - VERSION=1.36.1
-        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25
         - 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
         - NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
+        - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic