diff --git a/.tekton/fedora-bootc-42-iot-pull-request.yaml b/.tekton/fedora-bootc-42-iot-pull-request.yaml
index 397c385..75032e1 100644
--- a/.tekton/fedora-bootc-42-iot-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-iot-pull-request.yaml
@@ -8,12 +8,21 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
-      || "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
-      || "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
-      "./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-42-iot-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-iot-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged()
+        "minimal-plus/***".pathChanged() ||
+        "iot.yaml".pathChanged() ||
+        "iot/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-42-iot-push.yaml b/.tekton/fedora-bootc-42-iot-push.yaml
index 8072475..b7f4fcc 100644
--- a/.tekton/fedora-bootc-42-iot-push.yaml
+++ b/.tekton/fedora-bootc-42-iot-push.yaml
@@ -7,12 +7,21 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
-      || "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
-      || "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
-      "./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-42-iot-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-iot-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged() ||
+        "minimal-plus/***".pathChanged() ||
+        "iot.yaml".pathChanged() ||
+        "iot/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml
index 683e297..25b51d4 100644
--- a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml
@@ -8,10 +8,19 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-plus-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-minimal-plus-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged() ||
+        "minimal-plus/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-42-minimal-plus-push.yaml b/.tekton/fedora-bootc-42-minimal-plus-push.yaml
index aaee2e3..cbb94a4 100644
--- a/.tekton/fedora-bootc-42-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-plus-push.yaml
@@ -7,10 +7,19 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged() ||
+        "minimal-plus/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-42-minimal-pull-request.yaml b/.tekton/fedora-bootc-42-minimal-pull-request.yaml
index b77e9a2..a735715 100644
--- a/.tekton/fedora-bootc-42-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-minimal-pull-request.yaml
@@ -8,10 +8,17 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-minimal-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-42-minimal-push.yaml b/.tekton/fedora-bootc-42-minimal-push.yaml
index bd3bd82..144daaa 100644
--- a/.tekton/fedora-bootc-42-minimal-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-push.yaml
@@ -7,10 +7,17 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-42-standard-pull-request.yaml b/.tekton/fedora-bootc-42-standard-pull-request.yaml
index e729de1..4b8ef8a 100644
--- a/.tekton/fedora-bootc-42-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-standard-pull-request.yaml
@@ -8,10 +8,16 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./standard/***".pathChanged() || ".tekton/fedora-bootc-42-standard-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-standard-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "standard.yaml".pathChanged() ||
+        "standard/***".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-42-standard-push.yaml b/.tekton/fedora-bootc-42-standard-push.yaml
index bbe4a78..cc2faaa 100644
--- a/.tekton/fedora-bootc-42-standard-push.yaml
+++ b/.tekton/fedora-bootc-42-standard-push.yaml
@@ -7,10 +7,17 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./standard/***".pathChanged() || ".tekton/fedora-bootc-42-standard-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-42-standard-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "standard.yaml".pathChanged() ||
+        "standard/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-42
diff --git a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
index aa06a66..03f6234 100644
--- a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
@@ -8,12 +8,21 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
-      || "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
-      || "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
-      "./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-rawhide-iot-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-iot-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged() ||
+        "minimal-plus/***".pathChanged() ||
+        "iot.yaml".pathChanged() ||
+        "iot/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide
diff --git a/.tekton/fedora-bootc-rawhide-iot-push.yaml b/.tekton/fedora-bootc-rawhide-iot-push.yaml
index a8a84f0..e6489d6 100644
--- a/.tekton/fedora-bootc-rawhide-iot-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-push.yaml
@@ -7,12 +7,21 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
-      || "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
-      || "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
-      "./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged() ||
+        "minimal-plus/***".pathChanged() ||
+        "iot.yaml".pathChanged() ||
+        "iot/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide
diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
index 8b66b8c..e03eb54 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
@@ -8,10 +8,19 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged() ||
+        "minimal-plus/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide
diff --git a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
index 6712b5d..38dce5e 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
@@ -7,10 +7,19 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged() ||
+        "minimal-plus.hidden.yaml".pathChanged() ||
+        "minimal-plus/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide
diff --git a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
index e3777da..ba3fe8a 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
@@ -8,10 +8,17 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-minimal-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide
diff --git a/.tekton/fedora-bootc-rawhide-minimal-push.yaml b/.tekton/fedora-bootc-rawhide-minimal-push.yaml
index 7212d47..0bc921e 100644
--- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml
@@ -7,10 +7,17 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "minimal.yaml".pathChanged() ||
+        "minimal/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide
diff --git a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
index 80741d6..f5c5426 100644
--- a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
@@ -8,10 +8,17 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
-      == "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./standard/***".pathChanged() || ".tekton/fedora-bootc-rawhide-standard-pull-request.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-standard-pull-request.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "standard.yaml".pathChanged() ||
+        "standard/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide
diff --git a/.tekton/fedora-bootc-rawhide-standard-push.yaml b/.tekton/fedora-bootc-rawhide-standard-push.yaml
index c7dcead..bca91f1 100644
--- a/.tekton/fedora-bootc-rawhide-standard-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-push.yaml
@@ -7,10 +7,17 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     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" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
-      || "./standard/***".pathChanged() || ".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged()
-      || "Containerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" &&
+      (
+        target_branch == "main"
+      ) && (
+        ".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged() ||
+        "Containerfile".pathChanged() ||
+        "fedora-includes/generic.yaml".pathChanged() ||
+        "standard.yaml".pathChanged() ||
+        "standard/***".pathChanged()
+      )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fedora-bootc-rawhide