diff --git a/.tekton/kserve-agent-pull-request.yaml b/.tekton/kserve-agent-pull-request.yaml
index b95408fa0d..b10588d88e 100644
--- a/.tekton/kserve-agent-pull-request.yaml
+++ b/.tekton/kserve-agent-pull-request.yaml
@@ -7,8 +7,10 @@ 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
-      == "master"
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" 
+      && target_branch == "master" 
+      && ( !".tekton/**".pathChanged() || ".tekton/kserve-agent-pull-request.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-agent
diff --git a/.tekton/kserve-agent-push.yaml b/.tekton/kserve-agent-push.yaml
index dff9e65c76..38c60f86bf 100644
--- a/.tekton/kserve-agent-push.yaml
+++ b/.tekton/kserve-agent-push.yaml
@@ -6,8 +6,10 @@ 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
-      == "master"
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" 
+      && target_branch == "master" 
+      && ( !".tekton/**".pathChanged() || ".tekton/kserve-agent-push.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-agent
diff --git a/.tekton/kserve-controller-pull-request.yaml b/.tekton/kserve-controller-pull-request.yaml
index 41366bdce9..ffc4241804 100644
--- a/.tekton/kserve-controller-pull-request.yaml
+++ b/.tekton/kserve-controller-pull-request.yaml
@@ -7,8 +7,10 @@ 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
-      == "master"
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" 
+      && target_branch == "master" 
+      && ( !".tekton/**".pathChanged() || ".tekton/kserve-controller-pull-request.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-controller
diff --git a/.tekton/kserve-controller-push.yaml b/.tekton/kserve-controller-push.yaml
index ca72c5fed7..cb47b5a870 100644
--- a/.tekton/kserve-controller-push.yaml
+++ b/.tekton/kserve-controller-push.yaml
@@ -6,8 +6,10 @@ 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
-      == "master"
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" 
+      && target_branch == "master" 
+      && ( !".tekton/**".pathChanged() || ".tekton/kserve-controller-push.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-controller
diff --git a/.tekton/kserve-router-pull-request.yaml b/.tekton/kserve-router-pull-request.yaml
index 802840c201..9641c4b415 100644
--- a/.tekton/kserve-router-pull-request.yaml
+++ b/.tekton/kserve-router-pull-request.yaml
@@ -7,8 +7,10 @@ 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
-      == "master"
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request" 
+      && target_branch == "master" 
+      && ( !".tekton/**".pathChanged() || ".tekton/kserve-router-pull-request.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-router
diff --git a/.tekton/kserve-router-push.yaml b/.tekton/kserve-router-push.yaml
index 52846be903..e15bca704d 100644
--- a/.tekton/kserve-router-push.yaml
+++ b/.tekton/kserve-router-push.yaml
@@ -6,8 +6,10 @@ 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
-      == "master"
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push" 
+      && target_branch == "master" 
+      && ( !".tekton/**".pathChanged() || ".tekton/kserve-router-push.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-router
diff --git a/.tekton/kserve-storage-initializer-pull-request.yaml b/.tekton/kserve-storage-initializer-pull-request.yaml
index 9a0444a9de..50ef4aafea 100644
--- a/.tekton/kserve-storage-initializer-pull-request.yaml
+++ b/.tekton/kserve-storage-initializer-pull-request.yaml
@@ -7,9 +7,10 @@ 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
-      == "master" && ( "./python/***".pathChanged() || ".tekton/kserve-storage-initializer-pull-request.yaml".pathChanged()
-      || "storage-initializer.Dockerfile".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "pull_request"
+      && target_branch == "master"
+      && ( "python/**".pathChanged() || ".tekton/kserve-storage-initializer-pull-request.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-storage-initializer
diff --git a/.tekton/kserve-storage-initializer-push.yaml b/.tekton/kserve-storage-initializer-push.yaml
index 6147b976c5..43334dfeef 100644
--- a/.tekton/kserve-storage-initializer-push.yaml
+++ b/.tekton/kserve-storage-initializer-push.yaml
@@ -6,8 +6,10 @@ 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
-      == "master"
+    pipelinesascode.tekton.dev/on-cel-expression: |
+      event == "push"
+      && target_branch == "master"
+      && ( "python/**".pathChanged() || ".tekton/kserve-storage-initializer-push.yaml".pathChanged() )
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-storage-initializer