diff --git a/.tekton/branched/on-pull-request-overrides/fedora-coreos-branched-on-pull-request-overrides.yaml b/.tekton/branched/on-pull-request-overrides/fedora-coreos-branched-on-pull-request-overrides.yaml
new file mode 100644
index 00000000..a30b1c34
--- /dev/null
+++ b/.tekton/branched/on-pull-request-overrides/fedora-coreos-branched-on-pull-request-overrides.yaml
@@ -0,0 +1,61 @@
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: fedora-coreos-branched-on-pull-request-overrides
+  namespace: coreos-tenant
+  labels:
+    appstudio.openshift.io/application: fedora-coreos-branched
+    appstudio.openshift.io/component: fedora-coreos-branched
+    pipelines.appstudio.openshift.io/type: build
+  annotations:
+    build.appstudio.openshift.io/repo: https://github.com/coreos/fedora-coreos-config?rev={{revision}}
+    build.appstudio.redhat.com/cancel-in-progress: "true"
+    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" && "manifest-lock.overrides*".pathChanged() && target_branch == "branched"
+  creationTimestamp: null
+spec:
+  params:
+  - name: git-url
+    value: '{{source_url}}'
+  - name: revision
+    value: '{{revision}}'
+  - name: output-image
+    value: quay.io/konflux-fedora/coreos-tenant/fedora-coreos-{{target_branch}}:on-pr-{{revision}}
+  - name: dockerfile
+    value: Containerfile
+  - name: path-context
+    value: .
+  - name: privileged-nested
+    value: true
+  - name: build-args-file
+    value: build-args.conf
+  - name: workingdir-mount
+    value: /run/src
+  - name: build-platforms
+    value:
+    - linux/amd64
+    - linux/arm64
+    - linux/s390x
+    - linux/ppc64le
+  - name: clone-depth
+    value: 50
+  - name: hermetic
+    value: true
+  - name: prefetch-input
+    value: '[{"type": "rpm", "path": "."}]'
+  - name: image-expires-after
+    value: 5d
+  pipelineRef:
+    params:
+    - name: bundle
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
+    - name: name
+      value: buildah-build-bootc-multi-platform-oci-ta
+    - name: kind
+      value: pipeline
+    resolver: bundles
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-fedora-coreos-branched
diff --git a/.tekton/branched/on-pull-request/fedora-coreos-branched-on-pull-request.yaml b/.tekton/branched/on-pull-request/fedora-coreos-branched-on-pull-request.yaml
index e6386a98..44580ad9 100644
--- a/.tekton/branched/on-pull-request/fedora-coreos-branched-on-pull-request.yaml
+++ b/.tekton/branched/on-pull-request/fedora-coreos-branched-on-pull-request.yaml
@@ -14,7 +14,7 @@ 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 == "branched" && !(files.all.all(f, f.matches("ci/buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && !("manifest-lock.overrides*".pathChanged()) && target_branch == "branched"
   creationTimestamp: null
 spec:
   params:
@@ -51,7 +51,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/branched/on-push/fedora-coreos-branched-on-push.yaml b/.tekton/branched/on-push/fedora-coreos-branched-on-push.yaml
index 5fdcd6e4..dc733138 100644
--- a/.tekton/branched/on-push/fedora-coreos-branched-on-push.yaml
+++ b/.tekton/branched/on-push/fedora-coreos-branched-on-push.yaml
@@ -13,7 +13,7 @@ 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 == "branched" && !(files.all.all(f, f.matches("ci/buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && target_branch == "branched"
   creationTimestamp: null
 spec:
   params:
@@ -48,7 +48,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/next-devel/on-pull-request-overrides/fedora-coreos-next-devel-on-pull-request-overrides.yaml b/.tekton/next-devel/on-pull-request-overrides/fedora-coreos-next-devel-on-pull-request-overrides.yaml
new file mode 100644
index 00000000..d4863b95
--- /dev/null
+++ b/.tekton/next-devel/on-pull-request-overrides/fedora-coreos-next-devel-on-pull-request-overrides.yaml
@@ -0,0 +1,61 @@
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: fedora-coreos-next-devel-on-pull-request-overrides
+  namespace: coreos-tenant
+  labels:
+    appstudio.openshift.io/application: fedora-coreos-next-devel
+    appstudio.openshift.io/component: fedora-coreos-next-devel
+    pipelines.appstudio.openshift.io/type: build
+  annotations:
+    build.appstudio.openshift.io/repo: https://github.com/coreos/fedora-coreos-config?rev={{revision}}
+    build.appstudio.redhat.com/cancel-in-progress: "true"
+    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" && "manifest-lock.overrides*".pathChanged() && target_branch == "next-devel"
+  creationTimestamp: null
+spec:
+  params:
+  - name: git-url
+    value: '{{source_url}}'
+  - name: revision
+    value: '{{revision}}'
+  - name: output-image
+    value: quay.io/konflux-fedora/coreos-tenant/fedora-coreos-{{target_branch}}:on-pr-{{revision}}
+  - name: dockerfile
+    value: Containerfile
+  - name: path-context
+    value: .
+  - name: privileged-nested
+    value: true
+  - name: build-args-file
+    value: build-args.conf
+  - name: workingdir-mount
+    value: /run/src
+  - name: build-platforms
+    value:
+    - linux/amd64
+    - linux/arm64
+    - linux/s390x
+    - linux/ppc64le
+  - name: clone-depth
+    value: 50
+  - name: hermetic
+    value: true
+  - name: prefetch-input
+    value: '[{"type": "rpm", "path": "."}]'
+  - name: image-expires-after
+    value: 5d
+  pipelineRef:
+    params:
+    - name: bundle
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
+    - name: name
+      value: buildah-build-bootc-multi-platform-oci-ta
+    - name: kind
+      value: pipeline
+    resolver: bundles
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-fedora-coreos-next-devel
diff --git a/.tekton/next-devel/on-pull-request/fedora-coreos-next-devel-on-pull-request.yaml b/.tekton/next-devel/on-pull-request/fedora-coreos-next-devel-on-pull-request.yaml
index ae024fed..2c7fbce8 100644
--- a/.tekton/next-devel/on-pull-request/fedora-coreos-next-devel-on-pull-request.yaml
+++ b/.tekton/next-devel/on-pull-request/fedora-coreos-next-devel-on-pull-request.yaml
@@ -14,7 +14,7 @@ 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 == "next-devel" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && !("manifest-lock.overrides*".pathChanged()) && target_branch == "next-devel"
   creationTimestamp: null
 spec:
   params:
@@ -51,7 +51,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/next-devel/on-push/fedora-coreos-next-devel-on-push.yaml b/.tekton/next-devel/on-push/fedora-coreos-next-devel-on-push.yaml
index a23843b2..bde7c6ce 100644
--- a/.tekton/next-devel/on-push/fedora-coreos-next-devel-on-push.yaml
+++ b/.tekton/next-devel/on-push/fedora-coreos-next-devel-on-push.yaml
@@ -13,7 +13,7 @@ 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 == "next-devel" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && target_branch == "next-devel"
   creationTimestamp: null
 spec:
   params:
@@ -48,7 +48,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/next/on-pull-request/fedora-coreos-next-on-pull-request.yaml b/.tekton/next/on-pull-request/fedora-coreos-next-on-pull-request.yaml
index 15a5d43c..4c2186f2 100644
--- a/.tekton/next/on-pull-request/fedora-coreos-next-on-pull-request.yaml
+++ b/.tekton/next/on-pull-request/fedora-coreos-next-on-pull-request.yaml
@@ -14,7 +14,7 @@ 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 == "next" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && !("manifest-lock.overrides*".pathChanged()) && target_branch == "next"
   creationTimestamp: null
 spec:
   params:
@@ -51,7 +51,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/next/on-push/fedora-coreos-next-on-push.yaml b/.tekton/next/on-push/fedora-coreos-next-on-push.yaml
index 95c94865..2794955c 100644
--- a/.tekton/next/on-push/fedora-coreos-next-on-push.yaml
+++ b/.tekton/next/on-push/fedora-coreos-next-on-push.yaml
@@ -13,7 +13,7 @@ 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 == "next" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && target_branch == "next"
   creationTimestamp: null
 spec:
   params:
@@ -48,7 +48,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/rawhide/on-pull-request-overrides/fedora-coreos-rawhide-on-pull-request-overrides.yaml b/.tekton/rawhide/on-pull-request-overrides/fedora-coreos-rawhide-on-pull-request-overrides.yaml
new file mode 100644
index 00000000..2c7bdaa6
--- /dev/null
+++ b/.tekton/rawhide/on-pull-request-overrides/fedora-coreos-rawhide-on-pull-request-overrides.yaml
@@ -0,0 +1,61 @@
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: fedora-coreos-rawhide-on-pull-request-overrides
+  namespace: coreos-tenant
+  labels:
+    appstudio.openshift.io/application: fedora-coreos-rawhide
+    appstudio.openshift.io/component: fedora-coreos-rawhide
+    pipelines.appstudio.openshift.io/type: build
+  annotations:
+    build.appstudio.openshift.io/repo: https://github.com/coreos/fedora-coreos-config?rev={{revision}}
+    build.appstudio.redhat.com/cancel-in-progress: "true"
+    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" && "manifest-lock.overrides*".pathChanged() && target_branch == "rawhide"
+  creationTimestamp: null
+spec:
+  params:
+  - name: git-url
+    value: '{{source_url}}'
+  - name: revision
+    value: '{{revision}}'
+  - name: output-image
+    value: quay.io/konflux-fedora/coreos-tenant/fedora-coreos-{{target_branch}}:on-pr-{{revision}}
+  - name: dockerfile
+    value: Containerfile
+  - name: path-context
+    value: .
+  - name: privileged-nested
+    value: true
+  - name: build-args-file
+    value: build-args.conf
+  - name: workingdir-mount
+    value: /run/src
+  - name: build-platforms
+    value:
+    - linux/amd64
+    - linux/arm64
+    - linux/s390x
+    - linux/ppc64le
+  - name: clone-depth
+    value: 50
+  - name: hermetic
+    value: true
+  - name: prefetch-input
+    value: '[{"type": "rpm", "path": "."}]'
+  - name: image-expires-after
+    value: 5d
+  pipelineRef:
+    params:
+    - name: bundle
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
+    - name: name
+      value: buildah-build-bootc-multi-platform-oci-ta
+    - name: kind
+      value: pipeline
+    resolver: bundles
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-fedora-coreos-rawhide
diff --git a/.tekton/rawhide/on-pull-request/fedora-coreos-rawhide-on-pull-request.yaml b/.tekton/rawhide/on-pull-request/fedora-coreos-rawhide-on-pull-request.yaml
index 2ec30980..c35adaa3 100644
--- a/.tekton/rawhide/on-pull-request/fedora-coreos-rawhide-on-pull-request.yaml
+++ b/.tekton/rawhide/on-pull-request/fedora-coreos-rawhide-on-pull-request.yaml
@@ -14,7 +14,7 @@ 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 == "rawhide" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && !("manifest-lock.overrides*".pathChanged()) && target_branch == "rawhide"
   creationTimestamp: null
 spec:
   params:
@@ -51,7 +51,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/rawhide/on-push/fedora-coreos-rawhide-on-push.yaml b/.tekton/rawhide/on-push/fedora-coreos-rawhide-on-push.yaml
index da76d9da..5661382c 100644
--- a/.tekton/rawhide/on-push/fedora-coreos-rawhide-on-push.yaml
+++ b/.tekton/rawhide/on-push/fedora-coreos-rawhide-on-push.yaml
@@ -48,7 +48,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/stable/on-pull-request/fedora-coreos-stable-on-pull-request.yaml b/.tekton/stable/on-pull-request/fedora-coreos-stable-on-pull-request.yaml
index ce2c8f34..296a1b0e 100644
--- a/.tekton/stable/on-pull-request/fedora-coreos-stable-on-pull-request.yaml
+++ b/.tekton/stable/on-pull-request/fedora-coreos-stable-on-pull-request.yaml
@@ -14,7 +14,7 @@ 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 == "stable" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && !("manifest-lock.overrides*".pathChanged()) && target_branch == "stable"
   creationTimestamp: null
 spec:
   params:
@@ -51,7 +51,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/stable/on-push/fedora-coreos-stable-on-push.yaml b/.tekton/stable/on-push/fedora-coreos-stable-on-push.yaml
index a1e4a911..e095be87 100644
--- a/.tekton/stable/on-push/fedora-coreos-stable-on-push.yaml
+++ b/.tekton/stable/on-push/fedora-coreos-stable-on-push.yaml
@@ -13,7 +13,7 @@ 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 == "stable" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && target_branch == "stable"
   creationTimestamp: null
 spec:
   params:
@@ -48,7 +48,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/testing-devel/on-pull-request-overrides/fedora-coreos-testing-devel-on-pull-request-overrides.yaml b/.tekton/testing-devel/on-pull-request-overrides/fedora-coreos-testing-devel-on-pull-request-overrides.yaml
new file mode 100644
index 00000000..43280bc7
--- /dev/null
+++ b/.tekton/testing-devel/on-pull-request-overrides/fedora-coreos-testing-devel-on-pull-request-overrides.yaml
@@ -0,0 +1,61 @@
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: fedora-coreos-testing-devel-on-pull-request-overrides
+  namespace: coreos-tenant
+  labels:
+    appstudio.openshift.io/application: fedora-coreos-testing-devel
+    appstudio.openshift.io/component: fedora-coreos-testing-devel
+    pipelines.appstudio.openshift.io/type: build
+  annotations:
+    build.appstudio.openshift.io/repo: https://github.com/coreos/fedora-coreos-config?rev={{revision}}
+    build.appstudio.redhat.com/cancel-in-progress: "true"
+    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" && "manifest-lock.overrides*".pathChanged() && target_branch == "testing-devel"
+  creationTimestamp: null
+spec:
+  params:
+  - name: git-url
+    value: '{{source_url}}'
+  - name: revision
+    value: '{{revision}}'
+  - name: output-image
+    value: quay.io/konflux-fedora/coreos-tenant/fedora-coreos-{{target_branch}}:on-pr-{{revision}}
+  - name: dockerfile
+    value: Containerfile
+  - name: path-context
+    value: .
+  - name: privileged-nested
+    value: true
+  - name: build-args-file
+    value: build-args.conf
+  - name: workingdir-mount
+    value: /run/src
+  - name: build-platforms
+    value:
+    - linux/amd64
+    - linux/arm64
+    - linux/s390x
+    - linux/ppc64le
+  - name: clone-depth
+    value: 50
+  - name: hermetic
+    value: true
+  - name: prefetch-input
+    value: '[{"type": "rpm", "path": "."}]'
+  - name: image-expires-after
+    value: 5d
+  pipelineRef:
+    params:
+    - name: bundle
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
+    - name: name
+      value: buildah-build-bootc-multi-platform-oci-ta
+    - name: kind
+      value: pipeline
+    resolver: bundles
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-fedora-coreos-testing-devel
diff --git a/.tekton/testing-devel/on-pull-request/fedora-coreos-testing-devel-on-pull-request.yaml b/.tekton/testing-devel/on-pull-request/fedora-coreos-testing-devel-on-pull-request.yaml
index e3746576..bb2076ca 100644
--- a/.tekton/testing-devel/on-pull-request/fedora-coreos-testing-devel-on-pull-request.yaml
+++ b/.tekton/testing-devel/on-pull-request/fedora-coreos-testing-devel-on-pull-request.yaml
@@ -14,7 +14,7 @@ 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 == "testing-devel" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && !("manifest-lock.overrides*".pathChanged()) && target_branch == "testing-devel"
   creationTimestamp: null
 spec:
   params:
@@ -51,7 +51,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/testing-devel/on-push/fedora-coreos-testing-devel-on-push.yaml b/.tekton/testing-devel/on-push/fedora-coreos-testing-devel-on-push.yaml
index 1e77ede6..71e9bad2 100644
--- a/.tekton/testing-devel/on-push/fedora-coreos-testing-devel-on-push.yaml
+++ b/.tekton/testing-devel/on-push/fedora-coreos-testing-devel-on-push.yaml
@@ -13,7 +13,7 @@ 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 == "testing-devel" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && target_branch == "testing-devel"
   creationTimestamp: null
 spec:
   params:
@@ -48,7 +48,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/testing/on-pull-request/fedora-coreos-testing-on-pull-request.yaml b/.tekton/testing/on-pull-request/fedora-coreos-testing-on-pull-request.yaml
index 4ae95dd5..9c20b4d4 100644
--- a/.tekton/testing/on-pull-request/fedora-coreos-testing-on-pull-request.yaml
+++ b/.tekton/testing/on-pull-request/fedora-coreos-testing-on-pull-request.yaml
@@ -14,7 +14,7 @@ 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 == "testing" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && !("manifest-lock.overrides*".pathChanged()) && target_branch == "testing"
   creationTimestamp: null
 spec:
   params:
@@ -51,7 +51,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/testing/on-push/fedora-coreos-testing-on-push.yaml b/.tekton/testing/on-push/fedora-coreos-testing-on-push.yaml
index daeef922..c935fb31 100644
--- a/.tekton/testing/on-push/fedora-coreos-testing-on-push.yaml
+++ b/.tekton/testing/on-push/fedora-coreos-testing-on-push.yaml
@@ -13,7 +13,7 @@ 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 == "testing" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/")))
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && !(files.all.all(f, f.matches("ci/buildroot/") || f.matches(".tekton/fcos-buildroot/"))) && target_branch == "testing"
   creationTimestamp: null
 spec:
   params:
@@ -48,7 +48,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:b16aa8d0330ebe9161b2671976893fc9cf9ae128ade608d60fb80e75c400620d
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:d10dce3f9cc8437db7a5ba1bae5df3ac94359c5db7c9d4a4ae1b843fa9658540
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind