diff --git a/.tekton/bundle-build.yaml b/.tekton/bundle-build.yaml
index 788d99dbf7..1be71389c2 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
@@ -80,6 +79,9 @@ spec:
       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
@@ -99,10 +101,6 @@ spec:
       set of values is determined by the configuration of the multi-platform-controller.
     name: build-platforms
     type: array
-  - name: enable-cache-proxy
-    default: 'false'
-    description: Enable cache proxy configuration
-    type: string
   results:
   - description: ""
     name: IMAGE_URL
@@ -151,14 +149,14 @@ spec:
       value: $(tasks.clone-repository.results.url)
     - name: BUILDAH_FORMAT
       value: $(params.buildah-format)
-    - name: SOURCE_ARTIFACT
-      value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
-    - name: CACHI2_ARTIFACT
-      value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
     - 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)
     runAfter:
     - prefetch-dependencies
     taskRef:
diff --git a/.tekton/docker-build.yaml b/.tekton/docker-build.yaml
index 1a0a7247b3..d62f32705a 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
@@ -89,6 +88,9 @@ spec:
       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
@@ -199,6 +201,8 @@ spec:
       value: $(params.rebuild)
     - name: skip-checks
       value: $(params.skip-checks)
+    - name: enable-cache-proxy
+      value: $(params.enable-cache-proxy)
     taskRef:
       params:
       - name: name
@@ -269,6 +273,10 @@ spec:
       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
diff --git a/.tekton/fbc-builder.yaml b/.tekton/fbc-builder.yaml
index 11584c14c3..fa401b79cc 100755
--- a/.tekton/fbc-builder.yaml
+++ b/.tekton/fbc-builder.yaml
@@ -1,7 +1,6 @@
 apiVersion: tekton.dev/v1
 kind: Pipeline
 metadata:
-  creationTimestamp: null
   labels:
     pipelines.openshift.io/runtime: fbc
     pipelines.openshift.io/strategy: fbc
@@ -76,6 +75,9 @@ spec:
     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
@@ -125,6 +127,8 @@ spec:
       value: $(params.rebuild)
     - name: skip-checks
       value: $(params.skip-checks)
+    - name: enable-cache-proxy
+      value: $(params.enable-cache-proxy)
     taskRef:
       params:
       - name: name
@@ -242,6 +246,10 @@ spec:
       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
diff --git a/.tekton/serverless-index-137-fbc-421-pull-request.yaml b/.tekton/serverless-index-137-fbc-421-pull-request.yaml
deleted file mode 100755
index 4c47aa6ddc..0000000000
--- a/.tekton/serverless-index-137-fbc-421-pull-request.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/openshift-knative/serverless-operator?rev={{revision}}
-    build.appstudio.redhat.com/commit_sha: '{{revision}}'
-    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.21/')) || files.all.exists(x, x.matches('^.tekton/')) )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: serverless-operator-137-fbc-421
-    appstudio.openshift.io/component: serverless-index-137-fbc-421
-    pipelines.appstudio.openshift.io/type: build
-  name: serverless-index-137-fbc-421-on-pull-request
-  namespace: ocp-serverless-tenant
-spec:
-  params:
-    - name: dockerfile
-      value: Dockerfile
-    - name: path-context
-      value: ./olm-catalog/serverless-operator-index/v4.21
-    - name: build-args
-      value:
-        - VERSION=1.37.0
-        - 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_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
-        - JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk
-        - 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
-    - name: git-url
-      value: '{{source_url}}'
-    - name: hermetic
-      value: "true"
-    - name: image-expires-after
-      value: 5d
-    - name: output-image
-      value: quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-137-fbc-421/serverless-index-137-fbc-421:on-pr-{{revision}}
-    - name: build-platforms
-      value:
-        - linux/x86_64
-    - name: revision
-      value: '{{revision}}'
-  pipelineRef:
-    name: fbc-builder
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-serverless-index-137-fbc-421
-  workspaces:
-    - name: git-auth
-      secret:
-        secretName: '{{ git_auth_secret }}'
diff --git a/.tekton/serverless-index-137-fbc-421-push.yaml b/.tekton/serverless-index-137-fbc-421-push.yaml
deleted file mode 100755
index 64b50d25af..0000000000
--- a/.tekton/serverless-index-137-fbc-421-push.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-apiVersion: tekton.dev/v1
-kind: PipelineRun
-metadata:
-  annotations:
-    build.appstudio.openshift.io/repo: https://github.com/openshift-knative/serverless-operator?rev={{revision}}
-    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.21/')) || files.all.exists(x, x.matches('^.tekton/')) )
-  creationTimestamp: null
-  labels:
-    appstudio.openshift.io/application: serverless-operator-137-fbc-421
-    appstudio.openshift.io/component: serverless-index-137-fbc-421
-    pipelines.appstudio.openshift.io/type: build
-  name: serverless-index-137-fbc-421-on-push
-  namespace: ocp-serverless-tenant
-spec:
-  params:
-    - name: dockerfile
-      value: Dockerfile
-    - name: path-context
-      value: ./olm-catalog/serverless-operator-index/v4.21
-    - name: build-args
-      value:
-        - VERSION=1.37.0
-        - 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_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
-    - 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-421/serverless-index-137-fbc-421:{{revision}}
-    - name: revision
-      value: '{{revision}}'
-    - name: additional-tags
-      value:
-        - $(context.pipelineRun.uid)-{{revision}}
-        - 1.37.0
-        - latest
-  pipelineRef:
-    name: fbc-builder
-  taskRunTemplate:
-    serviceAccountName: build-pipeline-serverless-index-137-fbc-421
-  workspaces:
-    - name: git-auth
-      secret:
-        secretName: '{{ git_auth_secret }}'