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 89c36a08f2..c6fcb58793 100755
--- a/.tekton/bundle-build.yaml
+++ b/.tekton/bundle-build.yaml
@@ -26,7 +26,8 @@ spec:
     name: build-source-image
     type: string
   - default: "false"
-    description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
+    description: 'Enable in-development package managers. WARNING: the behavior may
+      change at any time without notice. Use at your own risk.'
     name: prefetch-input-dev-package-managers
   - default: []
     description: Additional image tags
@@ -43,11 +44,13 @@ 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"
@@ -63,16 +66,26 @@ spec:
     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: docker
-    description: The format for the resulting image's mediaType. Valid values are oci or 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: "true"
+    description: Use the package registry proxy when prefetching dependencies
+    name: enable-package-registry-proxy
+  - default: .
+    description: Target directories in component's source code to scan with SAST tools.
+      Multiple values should be separated with commas.
+    name: sast-target-dirs
+    type: string
   - default: []
     description: Array of --build-arg values ("arg=value" strings) for buildah
     name: build-args
@@ -82,22 +95,32 @@ spec:
     name: build-args-file
     type: string
   - default: "false"
-    description: Whether to enable privileged mode, should be used only with remote VMs
+    description: Whether to enable privileged mode, should be used only with remote
+      VMs
     name: privileged-nested
     type: string
+  - default: ""
+    description: Sets the image created time and the SOURCE_DATE_EPOCH build argument.
+      On its own, it does not change file timestamps inside the layers (set rewrite-timestamp
+      to "true" for that). Leave empty to keep the actual build time.
+    name: source-date-epoch
+    type: string
+  - default: "false"
+    description: When "true", clamp file modification times in the image layers to
+      at most source-date-epoch. Does nothing unless source-date-epoch is set.
+    name: rewrite-timestamp
+    type: string
+  - default: "false"
+    description: When "true", omit the build history (history timestamps, layer metadata,
+      etc.) from the resulting image.
+    name: omit-history
+    type: string
   - default:
     - linux/x86_64
-    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
-  - name: sast-target-dirs
-    type: string
-    default: .
-    description: Target directories to scan with SAST tools. Multiple values should be separated with commas.
-  - name: enable-package-registry-proxy
-    default: 'true'
-    description: Use the package registry proxy when prefetching dependencies
-    type: string
   results:
   - description: ""
     name: IMAGE_URL
@@ -150,6 +173,12 @@ spec:
       value: $(tasks.init.results.http-proxy)
     - name: NO_PROXY
       value: $(tasks.init.results.no-proxy)
+    - name: SOURCE_DATE_EPOCH
+      value: $(params.source-date-epoch)
+    - name: REWRITE_TIMESTAMP
+      value: $(params.rewrite-timestamp)
+    - name: OMIT_HISTORY
+      value: $(params.omit-history)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
@@ -173,12 +202,12 @@ spec:
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
       value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: TARGET_DIRS
+      value: $(params.sast-target-dirs)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
-    - name: TARGET_DIRS
-      value: $(params.sast-target-dirs)
     runAfter:
     - build-image-index
     taskRef:
@@ -201,14 +230,14 @@ spec:
       value: $(params.prefetch-input-dev-package-managers)
     - name: input
       value: $(params.prefetch-input)
+    - name: enable-package-registry-proxy
+      value: $(params.enable-package-registry-proxy)
     - name: SOURCE_ARTIFACT
       value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
     - name: ociStorage
       value: $(params.output-image).prefetch
     - name: ociArtifactExpiresAfter
       value: $(params.image-expires-after)
-    - name: enable-package-registry-proxy
-      value: $(params.enable-package-registry-proxy)
     runAfter:
     - clone-repository
     taskRef:
@@ -411,12 +440,12 @@ spec:
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
       value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: TARGET_DIRS
+      value: $(params.sast-target-dirs)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
-    - name: TARGET_DIRS
-      value: $(params.sast-target-dirs)
     runAfter:
     - build-image-index
     taskRef:
@@ -439,12 +468,12 @@ spec:
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
       value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: TARGET_DIRS
+      value: $(params.sast-target-dirs)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
-    - name: TARGET_DIRS
-      value: $(params.sast-target-dirs)
     runAfter:
     - build-image-index
     taskRef:
diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml
index 20d12edf91..8d87b75fb9 100755
--- a/.tekton/docker-build.yaml
+++ b/.tekton/docker-build.yaml
@@ -18,7 +18,8 @@ spec:
     - 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: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -30,7 +31,8 @@ spec:
     name: build-source-image
     type: string
   - default: "false"
-    description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
+    description: 'Enable in-development package managers. WARNING: the behavior may
+      change at any time without notice. Use at your own risk.'
     name: prefetch-input-dev-package-managers
   - default: []
     description: Additional image tags
@@ -47,11 +49,13 @@ 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"
@@ -67,7 +71,8 @@ spec:
     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"
@@ -75,12 +80,21 @@ spec:
     name: build-image-index
     type: string
   - default: docker
-    description: The format for the resulting image's mediaType. Valid values are oci or 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: "true"
+    description: Use the package registry proxy when prefetching dependencies
+    name: enable-package-registry-proxy
+  - default: .
+    description: Target directories in component's source code to scan with SAST tools.
+      Multiple values should be separated with commas.
+    name: sast-target-dirs
+    type: string
   - default: []
     description: Array of --build-arg values ("arg=value" strings) for buildah
     name: build-args
@@ -90,16 +104,25 @@ spec:
     name: build-args-file
     type: string
   - default: "false"
-    description: Whether to enable privileged mode, should be used only with remote VMs
+    description: Whether to enable privileged mode, should be used only with remote
+      VMs
     name: privileged-nested
     type: string
-  - name: sast-target-dirs
+  - default: ""
+    description: Sets the image created time and the SOURCE_DATE_EPOCH build argument.
+      On its own, it does not change file timestamps inside the layers (set rewrite-timestamp
+      to "true" for that). Leave empty to keep the actual build time.
+    name: source-date-epoch
     type: string
-    default: .
-    description: Target directories to scan with SAST tools. Multiple values should be separated with commas.
-  - name: enable-package-registry-proxy
-    default: 'true'
-    description: Use the package registry proxy when prefetching dependencies
+  - default: "false"
+    description: When "true", clamp file modification times in the image layers to
+      at most source-date-epoch. Does nothing unless source-date-epoch is set.
+    name: rewrite-timestamp
+    type: string
+  - default: "false"
+    description: When "true", omit the build history (history timestamps, layer metadata,
+      etc.) from the resulting image.
+    name: omit-history
     type: string
   results:
   - description: ""
@@ -123,12 +146,12 @@ spec:
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
       value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: TARGET_DIRS
+      value: $(params.sast-target-dirs)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
-    - name: TARGET_DIRS
-      value: $(params.sast-target-dirs)
     runAfter:
     - build-image-index
     taskRef:
@@ -151,14 +174,14 @@ spec:
       value: $(params.prefetch-input-dev-package-managers)
     - name: input
       value: $(params.prefetch-input)
+    - name: enable-package-registry-proxy
+      value: $(params.enable-package-registry-proxy)
     - name: SOURCE_ARTIFACT
       value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
     - name: ociStorage
       value: $(params.output-image).prefetch
     - name: ociArtifactExpiresAfter
       value: $(params.image-expires-after)
-    - name: enable-package-registry-proxy
-      value: $(params.enable-package-registry-proxy)
     runAfter:
     - clone-repository
     taskRef:
@@ -267,6 +290,12 @@ spec:
       value: $(tasks.init.results.http-proxy)
     - name: NO_PROXY
       value: $(tasks.init.results.no-proxy)
+    - name: SOURCE_DATE_EPOCH
+      value: $(params.source-date-epoch)
+    - name: REWRITE_TIMESTAMP
+      value: $(params.rewrite-timestamp)
+    - name: OMIT_HISTORY
+      value: $(params.omit-history)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
@@ -439,12 +468,12 @@ spec:
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
       value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: TARGET_DIRS
+      value: $(params.sast-target-dirs)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
-    - name: TARGET_DIRS
-      value: $(params.sast-target-dirs)
     runAfter:
     - build-image-index
     taskRef:
@@ -467,12 +496,12 @@ spec:
       value: $(tasks.build-image-index.results.IMAGE_DIGEST)
     - name: image-url
       value: $(tasks.build-image-index.results.IMAGE_URL)
+    - name: TARGET_DIRS
+      value: $(params.sast-target-dirs)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
-    - name: TARGET_DIRS
-      value: $(params.sast-target-dirs)
     runAfter:
     - build-image-index
     taskRef:
diff --git a/.tekton/fbc-builder.yaml b/.tekton/fbc-builder.yaml
index 57ea75ab0a..d37f0b200d 100755
--- a/.tekton/fbc-builder.yaml
+++ b/.tekton/fbc-builder.yaml
@@ -15,9 +15,9 @@ spec:
   params:
   - default:
     - linux/x86_64
-    # - linux/arm64
-    # - linux/ppc64le
-    # - linux/s390x
+    - 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.
     name: build-platforms
@@ -26,6 +26,23 @@ spec:
     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
@@ -74,6 +91,14 @@ spec:
   - default: "false"
     description: Enable cache proxy configuration
     name: enable-cache-proxy
+  - default: "true"
+    description: Use the package registry proxy when prefetching dependencies
+    name: enable-package-registry-proxy
+  - default: .
+    description: Target directories in component's source code to scan with SAST tools.
+      Multiple values should be separated with commas.
+    name: sast-target-dirs
+    type: string
   - default: []
     description: Array of --build-arg values ("arg=value" strings) for buildah
     name: build-args
@@ -82,9 +107,21 @@ 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: enable-package-registry-proxy
-    default: 'true'
-    description: Use the package registry proxy when prefetching dependencies
+  - default: ""
+    description: Sets the image created time and the SOURCE_DATE_EPOCH build argument.
+      On its own, it does not change file timestamps inside the layers (set rewrite-timestamp
+      to "true" for that). Leave empty to keep the actual build time.
+    name: source-date-epoch
+    type: string
+  - default: "false"
+    description: When "true", clamp file modification times in the image layers to
+      at most source-date-epoch. Does nothing unless source-date-epoch is set.
+    name: rewrite-timestamp
+    type: string
+  - default: "false"
+    description: When "true", omit the build history (history timestamps, layer metadata,
+      etc.) from the resulting image.
+    name: omit-history
     type: string
   results:
   - description: ""
@@ -100,6 +137,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:6a7c758802fd253735b15174c4e7ffffb6e271969adfddb3a083935986845166
+      - name: kind
+        value: task
+      resolver: bundles
   - name: apply-tags
     params:
     - name: ADDITIONAL_TAGS
@@ -156,43 +221,18 @@ spec:
     workspaces:
     - name: basic-auth
       workspace: git-auth
-  - name: run-opm-command
-    params:
-    - name: SOURCE_ARTIFACT
-      value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
-    - name: ociStorage
-      value: $(params.output-image).opm
-    - name: ociArtifactExpiresAfter
-      value: $(params.image-expires-after)
-    - name: OPM_ARGS
-      value: []
-    - name: OPM_OUTPUT_PATH
-      value: ""
-    - name: IDMS_PATH
-      value: ""
-    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:6a7c758802fd253735b15174c4e7ffffb6e271969adfddb3a083935986845166
-      - name: kind
-        value: task
-      resolver: bundles
   - name: prefetch-dependencies
     params:
     - name: input
       value: $(params.prefetch-input)
+    - name: enable-package-registry-proxy
+      value: $(params.enable-package-registry-proxy)
     - name: SOURCE_ARTIFACT
       value: $(tasks.run-opm-command.results.SOURCE_ARTIFACT)
     - name: ociStorage
       value: $(params.output-image).prefetch
     - name: ociArtifactExpiresAfter
       value: $(params.image-expires-after)
-    - name: enable-package-registry-proxy
-      value: $(params.enable-package-registry-proxy)
     runAfter:
     - run-opm-command
     taskRef:
@@ -241,6 +281,12 @@ spec:
       value: $(tasks.init.results.http-proxy)
     - name: NO_PROXY
       value: $(tasks.init.results.no-proxy)
+    - name: SOURCE_DATE_EPOCH
+      value: $(params.source-date-epoch)
+    - name: REWRITE_TIMESTAMP
+      value: $(params.rewrite-timestamp)
+    - name: OMIT_HISTORY
+      value: $(params.omit-history)
     - name: SOURCE_ARTIFACT
       value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
     - name: CACHI2_ARTIFACT
diff --git a/.tekton/serverless-bundle-137-pull-request.yaml b/.tekton/serverless-bundle-137-pull-request.yaml
index 47075eb79f..f4b59e49e0 100755
--- a/.tekton/serverless-bundle-137-pull-request.yaml
+++ b/.tekton/serverless-bundle-137-pull-request.yaml
@@ -21,10 +21,10 @@ spec:
       value: olm-catalog/serverless-operator/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
diff --git a/.tekton/serverless-bundle-137-push.yaml b/.tekton/serverless-bundle-137-push.yaml
index 7f09b3c934..f422c92151 100755
--- a/.tekton/serverless-bundle-137-push.yaml
+++ b/.tekton/serverless-bundle-137-push.yaml
@@ -20,10 +20,10 @@ spec:
       value: olm-catalog/serverless-operator/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -40,7 +40,7 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
     - name: prefetch-input
       value: '[{"type":"rpm"}]'
diff --git a/.tekton/serverless-index-137-fbc-414-pull-request.yaml b/.tekton/serverless-index-137-fbc-414-pull-request.yaml
index 3090b9bb29..13276e7932 100755
--- a/.tekton/serverless-index-137-fbc-414-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-414-pull-request.yaml
@@ -23,10 +23,10 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.14
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -46,6 +46,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-137-fbc-414-push.yaml b/.tekton/serverless-index-137-fbc-414-push.yaml
index 7ef24e8e69..653cf118f6 100755
--- a/.tekton/serverless-index-137-fbc-414-push.yaml
+++ b/.tekton/serverless-index-137-fbc-414-push.yaml
@@ -22,10 +22,10 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.14
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -43,8 +43,18 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - 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-137-fbc-415-pull-request.yaml b/.tekton/serverless-index-137-fbc-415-pull-request.yaml
index 47e16c5cef..a6ecbcbfea 100755
--- a/.tekton/serverless-index-137-fbc-415-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-415-pull-request.yaml
@@ -23,16 +23,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.15
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.15
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.15
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -46,6 +46,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-137-fbc-415-push.yaml b/.tekton/serverless-index-137-fbc-415-push.yaml
index eb071e73a3..de5635257c 100755
--- a/.tekton/serverless-index-137-fbc-415-push.yaml
+++ b/.tekton/serverless-index-137-fbc-415-push.yaml
@@ -22,16 +22,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.15
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.15
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.15
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -43,8 +43,18 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - 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-137-fbc-416-pull-request.yaml b/.tekton/serverless-index-137-fbc-416-pull-request.yaml
index 53a98d4b52..d91ad0a2b2 100755
--- a/.tekton/serverless-index-137-fbc-416-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-416-pull-request.yaml
@@ -23,16 +23,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.16
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.16
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -46,6 +46,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-137-fbc-416-push.yaml b/.tekton/serverless-index-137-fbc-416-push.yaml
index 0289e86e4a..7fdd95f65d 100755
--- a/.tekton/serverless-index-137-fbc-416-push.yaml
+++ b/.tekton/serverless-index-137-fbc-416-push.yaml
@@ -22,16 +22,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.16
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.16
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.16
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -43,8 +43,18 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - 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-137-fbc-417-pull-request.yaml b/.tekton/serverless-index-137-fbc-417-pull-request.yaml
index 9f45e062ad..cb23f35a94 100755
--- a/.tekton/serverless-index-137-fbc-417-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-417-pull-request.yaml
@@ -23,16 +23,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.17
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.17
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -46,6 +46,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-137-fbc-417-push.yaml b/.tekton/serverless-index-137-fbc-417-push.yaml
index aeef4539b0..64ca717f53 100755
--- a/.tekton/serverless-index-137-fbc-417-push.yaml
+++ b/.tekton/serverless-index-137-fbc-417-push.yaml
@@ -22,16 +22,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.17
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.17
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.17
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -43,8 +43,19 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - 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-137-fbc-418-pull-request.yaml b/.tekton/serverless-index-137-fbc-418-pull-request.yaml
index d6d9fe4436..370ad894bc 100755
--- a/.tekton/serverless-index-137-fbc-418-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-418-pull-request.yaml
@@ -23,16 +23,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.18
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.18
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -46,6 +46,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-137-fbc-418-push.yaml b/.tekton/serverless-index-137-fbc-418-push.yaml
index 0a47020d27..bfef6e70bc 100755
--- a/.tekton/serverless-index-137-fbc-418-push.yaml
+++ b/.tekton/serverless-index-137-fbc-418-push.yaml
@@ -22,16 +22,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.18
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.18
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.18
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -43,8 +43,19 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - 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-137-fbc-419-pull-request.yaml b/.tekton/serverless-index-137-fbc-419-pull-request.yaml
index b7e99ebce6..7186f426a2 100755
--- a/.tekton/serverless-index-137-fbc-419-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-419-pull-request.yaml
@@ -23,16 +23,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.19
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.19
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -46,6 +46,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-137-fbc-419-push.yaml b/.tekton/serverless-index-137-fbc-419-push.yaml
index dc4578c340..c094c0590a 100755
--- a/.tekton/serverless-index-137-fbc-419-push.yaml
+++ b/.tekton/serverless-index-137-fbc-419-push.yaml
@@ -22,16 +22,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.19
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.19
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -43,8 +43,19 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - 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-137-fbc-420-pull-request.yaml b/.tekton/serverless-index-137-fbc-420-pull-request.yaml
index 10b4bbe4a3..af5a790678 100755
--- a/.tekton/serverless-index-137-fbc-420-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-420-pull-request.yaml
@@ -23,16 +23,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.20
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -46,6 +46,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-137-fbc-420-push.yaml b/.tekton/serverless-index-137-fbc-420-push.yaml
index e125708c3a..42db888d9d 100755
--- a/.tekton/serverless-index-137-fbc-420-push.yaml
+++ b/.tekton/serverless-index-137-fbc-420-push.yaml
@@ -22,16 +22,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.20
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.20
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.20
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -43,8 +43,19 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - 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-index-137-fbc-421-pull-request.yaml b/.tekton/serverless-index-137-fbc-421-pull-request.yaml
index f841b0f021..02f9906d33 100755
--- a/.tekton/serverless-index-137-fbc-421-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-421-pull-request.yaml
@@ -23,16 +23,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.21
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.21
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.21
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -46,6 +46,17 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.21/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.21/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.21/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-137-fbc-421-push.yaml b/.tekton/serverless-index-137-fbc-421-push.yaml
index 658a43a344..629966e82a 100755
--- a/.tekton/serverless-index-137-fbc-421-push.yaml
+++ b/.tekton/serverless-index-137-fbc-421-push.yaml
@@ -22,16 +22,16 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.21
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.21
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.21
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -43,8 +43,19 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.21/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.21/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.21/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-137-fbc-422-pull-request.yaml b/.tekton/serverless-index-137-fbc-422-pull-request.yaml
index 3018c49d0f..0bb4e37437 100755
--- a/.tekton/serverless-index-137-fbc-422-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-422-pull-request.yaml
@@ -23,10 +23,10 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.22
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -46,6 +46,17 @@ spec:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.22/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.22/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.22/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-137-fbc-422-push.yaml b/.tekton/serverless-index-137-fbc-422-push.yaml
index d0ff59e6e6..6ae618cd7d 100755
--- a/.tekton/serverless-index-137-fbc-422-push.yaml
+++ b/.tekton/serverless-index-137-fbc-422-push.yaml
@@ -22,10 +22,10 @@ spec:
       value: ./olm-catalog/serverless-operator-index/v4.22
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -43,8 +43,19 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.22/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.22/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.22/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
diff --git a/.tekton/serverless-index-137-fbc-412-pull-request.yaml b/.tekton/serverless-index-137-fbc-423-pull-request.yaml
similarity index 72%
rename from .tekton/serverless-index-137-fbc-412-pull-request.yaml
rename to .tekton/serverless-index-137-fbc-423-pull-request.yaml
index 63654b33c9..085b03d19b 100755
--- a/.tekton/serverless-index-137-fbc-412-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-423-pull-request.yaml
@@ -7,32 +7,32 @@ metadata:
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v4.12/')) || files.all.exists(x, x.matches('^.tekton/')) )
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v4.23/')) || files.all.exists(x, x.matches('^.tekton/')) )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: serverless-operator-137-fbc-412
-    appstudio.openshift.io/component: serverless-index-137-fbc-412
+    appstudio.openshift.io/application: serverless-operator-137-fbc-423
+    appstudio.openshift.io/component: serverless-index-137-fbc-423
     pipelines.appstudio.openshift.io/type: build
-  name: serverless-index-137-fbc-412-on-pull-request
+  name: serverless-index-137-fbc-423-on-pull-request
   namespace: ocp-serverless-tenant
 spec:
   params:
     - name: dockerfile
       value: Dockerfile
     - name: path-context
-      value: ./olm-catalog/serverless-operator-index/v4.12
+      value: ./olm-catalog/serverless-operator-index/v4.23
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.12
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.23
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -40,16 +40,27 @@ spec:
     - name: image-expires-after
       value: 5d
     - name: output-image
-      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-412/serverless-index-137-fbc-412:on-pr-{{revision}}
+      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-423/serverless-index-137-fbc-423:on-pr-{{revision}}
     - name: build-platforms
       value:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.23/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.23/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.23/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
-    serviceAccountName: build-pipeline-serverless-index-137-fbc-412
+    serviceAccountName: build-pipeline-serverless-index-137-fbc-423
   workspaces:
     - name: git-auth
       secret:
diff --git a/.tekton/serverless-index-137-fbc-412-push.yaml b/.tekton/serverless-index-137-fbc-423-push.yaml
similarity index 71%
rename from .tekton/serverless-index-137-fbc-412-push.yaml
rename to .tekton/serverless-index-137-fbc-423-push.yaml
index 529ea1fb03..c36ee24a74 100755
--- a/.tekton/serverless-index-137-fbc-412-push.yaml
+++ b/.tekton/serverless-index-137-fbc-423-push.yaml
@@ -6,49 +6,60 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v4.12/')) || files.all.exists(x, x.matches('^.tekton/')) )
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v4.23/')) || files.all.exists(x, x.matches('^.tekton/')) )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: serverless-operator-137-fbc-412
-    appstudio.openshift.io/component: serverless-index-137-fbc-412
+    appstudio.openshift.io/application: serverless-operator-137-fbc-423
+    appstudio.openshift.io/component: serverless-index-137-fbc-423
     pipelines.appstudio.openshift.io/type: build
-  name: serverless-index-137-fbc-412-on-push
+  name: serverless-index-137-fbc-423-on-push
   namespace: ocp-serverless-tenant
 spec:
   params:
     - name: dockerfile
       value: Dockerfile
     - name: path-context
-      value: ./olm-catalog/serverless-operator-index/v4.12
+      value: ./olm-catalog/serverless-operator-index/v4.23
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.12
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.23
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
       value: "true"
     - name: output-image
-      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-412/serverless-index-137-fbc-412:{{revision}}
+      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-423/serverless-index-137-fbc-423:{{revision}}
     - name: revision
       value: '{{revision}}'
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v4.23/catalog-template.yaml"
+        - --migrate-level=bundle-object-to-csv-metadata
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v4.23/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v4.23/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
-    serviceAccountName: build-pipeline-serverless-index-137-fbc-412
+    serviceAccountName: build-pipeline-serverless-index-137-fbc-423
   workspaces:
     - name: git-auth
       secret:
diff --git a/.tekton/serverless-index-137-fbc-413-pull-request.yaml b/.tekton/serverless-index-137-fbc-50-pull-request.yaml
similarity index 69%
rename from .tekton/serverless-index-137-fbc-413-pull-request.yaml
rename to .tekton/serverless-index-137-fbc-50-pull-request.yaml
index aaff0fb3d1..e556d2b67f 100755
--- a/.tekton/serverless-index-137-fbc-413-pull-request.yaml
+++ b/.tekton/serverless-index-137-fbc-50-pull-request.yaml
@@ -7,32 +7,32 @@ metadata:
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v4.13/')) || files.all.exists(x, x.matches('^.tekton/')) )
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v5.0/')) || files.all.exists(x, x.matches('^.tekton/')) )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: serverless-operator-137-fbc-413
-    appstudio.openshift.io/component: serverless-index-137-fbc-413
+    appstudio.openshift.io/application: serverless-operator-137-fbc-50
+    appstudio.openshift.io/component: serverless-index-137-fbc-50
     pipelines.appstudio.openshift.io/type: build
-  name: serverless-index-137-fbc-413-on-pull-request
+  name: serverless-index-137-fbc-50-on-pull-request
   namespace: ocp-serverless-tenant
 spec:
   params:
     - name: dockerfile
       value: Dockerfile
     - name: path-context
-      value: ./olm-catalog/serverless-operator-index/v4.13
+      value: ./olm-catalog/serverless-operator-index/v5.0
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.13
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.0
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
@@ -40,16 +40,26 @@ spec:
     - name: image-expires-after
       value: 5d
     - name: output-image
-      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-413/serverless-index-137-fbc-413:on-pr-{{revision}}
+      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-50/serverless-index-137-fbc-50:on-pr-{{revision}}
     - name: build-platforms
       value:
         - linux/x86_64
     - name: revision
       value: '{{revision}}'
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v5.0/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v5.0/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v5.0/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
-    serviceAccountName: build-pipeline-serverless-index-137-fbc-413
+    serviceAccountName: build-pipeline-serverless-index-137-fbc-50
   workspaces:
     - name: git-auth
       secret:
diff --git a/.tekton/serverless-index-137-fbc-413-push.yaml b/.tekton/serverless-index-137-fbc-50-push.yaml
similarity index 68%
rename from .tekton/serverless-index-137-fbc-413-push.yaml
rename to .tekton/serverless-index-137-fbc-50-push.yaml
index 944702c206..9f7002a0b9 100755
--- a/.tekton/serverless-index-137-fbc-413-push.yaml
+++ b/.tekton/serverless-index-137-fbc-50-push.yaml
@@ -6,49 +6,59 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v4.13/')) || files.all.exists(x, x.matches('^.tekton/')) )
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "release-1.37" && ( files.all.exists(x, x.matches('^olm-catalog/serverless-operator-index/v5.0/')) || files.all.exists(x, x.matches('^.tekton/')) )
   creationTimestamp: null
   labels:
-    appstudio.openshift.io/application: serverless-operator-137-fbc-413
-    appstudio.openshift.io/component: serverless-index-137-fbc-413
+    appstudio.openshift.io/application: serverless-operator-137-fbc-50
+    appstudio.openshift.io/component: serverless-index-137-fbc-50
     pipelines.appstudio.openshift.io/type: build
-  name: serverless-index-137-fbc-413-on-push
+  name: serverless-index-137-fbc-50-on-push
   namespace: ocp-serverless-tenant
 spec:
   params:
     - name: dockerfile
       value: Dockerfile
     - name: path-context
-      value: ./olm-catalog/serverless-operator-index/v4.13
+      value: ./olm-catalog/serverless-operator-index/v5.0
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
         - NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
         - NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
-        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.13
+        - OPM_IMAGE=registry.redhat.io/openshift4/ose-operator-registry:v4.0
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
       value: "true"
     - name: output-image
-      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-413/serverless-index-137-fbc-413:{{revision}}
+      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-50/serverless-index-137-fbc-50:{{revision}}
     - name: revision
       value: '{{revision}}'
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
+    - name: opm-args
+      value:
+        - alpha
+        - render-template
+        - basic
+        - "olm-catalog/serverless-operator-index/v5.0/catalog-template.yaml"
+    - name: opm-output-path
+      value: olm-catalog/serverless-operator-index/v5.0/catalog/serverless-operator/catalog.yaml
+    - name: file-to-update-pullspec
+      value: olm-catalog/serverless-operator-index/v5.0/catalog/serverless-operator/catalog.yaml
   pipelineRef:
     name: fbc-builder
   taskRunTemplate:
-    serviceAccountName: build-pipeline-serverless-index-137-fbc-413
+    serviceAccountName: build-pipeline-serverless-index-137-fbc-50
   workspaces:
     - name: git-auth
       secret:
diff --git a/.tekton/serverless-ingress-137-pull-request.yaml b/.tekton/serverless-ingress-137-pull-request.yaml
index 1bb6c649dc..6e6452ddbd 100755
--- a/.tekton/serverless-ingress-137-pull-request.yaml
+++ b/.tekton/serverless-ingress-137-pull-request.yaml
@@ -21,10 +21,10 @@ spec:
       value: serving/ingress/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
diff --git a/.tekton/serverless-ingress-137-push.yaml b/.tekton/serverless-ingress-137-push.yaml
index 70d0048c9d..28e856aa01 100755
--- a/.tekton/serverless-ingress-137-push.yaml
+++ b/.tekton/serverless-ingress-137-push.yaml
@@ -20,10 +20,10 @@ spec:
       value: serving/ingress/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -40,7 +40,7 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
     - name: prefetch-input
       value: '[{"type":"rpm"}]'
diff --git a/.tekton/serverless-kn-operator-137-pull-request.yaml b/.tekton/serverless-kn-operator-137-pull-request.yaml
index 84f92791d9..0de115b1b8 100755
--- a/.tekton/serverless-kn-operator-137-pull-request.yaml
+++ b/.tekton/serverless-kn-operator-137-pull-request.yaml
@@ -21,10 +21,10 @@ spec:
       value: knative-operator/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
diff --git a/.tekton/serverless-kn-operator-137-push.yaml b/.tekton/serverless-kn-operator-137-push.yaml
index b055c274ca..52e6da9da5 100755
--- a/.tekton/serverless-kn-operator-137-push.yaml
+++ b/.tekton/serverless-kn-operator-137-push.yaml
@@ -20,10 +20,10 @@ spec:
       value: knative-operator/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -40,7 +40,7 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
     - name: prefetch-input
       value: '[{"type":"rpm"}]'
diff --git a/.tekton/serverless-metadata-webhook-137-pull-request.yaml b/.tekton/serverless-metadata-webhook-137-pull-request.yaml
index 914076fc91..f08950f687 100755
--- a/.tekton/serverless-metadata-webhook-137-pull-request.yaml
+++ b/.tekton/serverless-metadata-webhook-137-pull-request.yaml
@@ -21,10 +21,10 @@ spec:
       value: serving/metadata-webhook/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
diff --git a/.tekton/serverless-metadata-webhook-137-push.yaml b/.tekton/serverless-metadata-webhook-137-push.yaml
index 74911a31b7..ed03121942 100755
--- a/.tekton/serverless-metadata-webhook-137-push.yaml
+++ b/.tekton/serverless-metadata-webhook-137-push.yaml
@@ -20,10 +20,10 @@ spec:
       value: serving/metadata-webhook/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -40,7 +40,7 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
     - name: prefetch-input
       value: '[{"type":"rpm"}]'
diff --git a/.tekton/serverless-must-gather-137-pull-request.yaml b/.tekton/serverless-must-gather-137-pull-request.yaml
index fd8f6cb355..144b62dae9 100755
--- a/.tekton/serverless-must-gather-137-pull-request.yaml
+++ b/.tekton/serverless-must-gather-137-pull-request.yaml
@@ -21,10 +21,10 @@ spec:
       value: must-gather/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
diff --git a/.tekton/serverless-must-gather-137-push.yaml b/.tekton/serverless-must-gather-137-push.yaml
index 2e8d9322e9..0db70d46c2 100755
--- a/.tekton/serverless-must-gather-137-push.yaml
+++ b/.tekton/serverless-must-gather-137-push.yaml
@@ -20,10 +20,10 @@ spec:
       value: must-gather/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -40,7 +40,7 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
     - name: prefetch-input
       value: '[{"type":"rpm"}]'
diff --git a/.tekton/serverless-openshift-kn-operator-137-pull-request.yaml b/.tekton/serverless-openshift-kn-operator-137-pull-request.yaml
index 47f1edb76e..64f8bcc404 100755
--- a/.tekton/serverless-openshift-kn-operator-137-pull-request.yaml
+++ b/.tekton/serverless-openshift-kn-operator-137-pull-request.yaml
@@ -21,10 +21,10 @@ spec:
       value: openshift-knative-operator/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
diff --git a/.tekton/serverless-openshift-kn-operator-137-push.yaml b/.tekton/serverless-openshift-kn-operator-137-push.yaml
index 7aae242ea1..fc19dea8e8 100755
--- a/.tekton/serverless-openshift-kn-operator-137-push.yaml
+++ b/.tekton/serverless-openshift-kn-operator-137-push.yaml
@@ -20,10 +20,10 @@ spec:
       value: openshift-knative-operator/Dockerfile
     - name: build-args
       value:
-        - VERSION=1.37.1
+        - VERSION=1.37.2
         - TAG=v1.17.0
         - CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
-        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
+        - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25
         - GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
         - JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
@@ -40,7 +40,7 @@ spec:
     - name: additional-tags
       value:
         - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.1
+        - 1.37.2
         - latest
     - name: prefetch-input
       value: '[{"type":"rpm"}]'