diff --git a/.tekton/fedora-bootc-42-minimal-on-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-pull-request.yaml
similarity index 82%
rename from .tekton/fedora-bootc-42-minimal-on-pull-request.yaml
rename to .tekton/fedora-bootc-42-minimal-pull-request.yaml
index 4a52302..3549dd3 100644
--- a/.tekton/fedora-bootc-42-minimal-on-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-minimal-pull-request.yaml
@@ -10,7 +10,7 @@ metadata:
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
       == "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-on-pull-request.yaml".pathChanged()
+      || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-pull-request.yaml".pathChanged()
       || "Containerfile".pathChanged() )
   creationTimestamp: null
   labels:
@@ -36,7 +36,7 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/fedora/fedora:42
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-42-compose:Fedora-42-20250409.0@sha256:c72e43a4baf6f744b5b87f546d61d9854aa8a6f3b754f94dc456dba76786addf
     - MANIFEST=fedora-minimal
   - name: image-expires-after
     value: 5d
@@ -45,7 +45,7 @@ spec:
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/fedora-testing/tekton-catalog:pipeline-buildah-build-bootc-multi-platform-oci-ta
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:2474cc2cd84db2bc0abe595d35a878d01af3bf8783aac0ccc252c9a7a00d8271
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind
diff --git a/.tekton/fedora-bootc-42-minimal-on-push.yaml b/.tekton/fedora-bootc-42-minimal-push.yaml
similarity index 70%
rename from .tekton/fedora-bootc-42-minimal-on-push.yaml
rename to .tekton/fedora-bootc-42-minimal-push.yaml
index bb474b9..3d713a3 100644
--- a/.tekton/fedora-bootc-42-minimal-on-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-push.yaml
@@ -8,7 +8,9 @@ metadata:
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
-      == "main"
+      == "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
+      || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged()
+      || "Containerfile".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
@@ -33,14 +35,14 @@ spec:
     value: true
   - name: build-args
     value:
-    - REPOS_IMAGE=quay.io/fedora/fedora:42
+    - REPOS_IMAGE=quay.io/bootc-devel/fedora-bootc-42-compose:Fedora-42-20250409.0@sha256:c72e43a4baf6f744b5b87f546d61d9854aa8a6f3b754f94dc456dba76786addf
     - MANIFEST=fedora-minimal
   - name: output-image
     value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-minimal:{{revision}}
   pipelineRef:
     params:
     - name: bundle
-      value: quay.io/fedora-testing/tekton-catalog:pipeline-buildah-build-bootc-multi-platform-oci-ta
+      value: quay.io/bootc-devel/tekton-catalog/pipeline-buildah-build-bootc-multi-platform-oci-ta@sha256:2474cc2cd84db2bc0abe595d35a878d01af3bf8783aac0ccc252c9a7a00d8271
     - name: name
       value: buildah-build-bootc-multi-platform-oci-ta
     - name: kind