diff --git a/.tekton/kserve-agent-nightly-pull-request.yaml b/.tekton/kserve-agent-nightly-pull-request.yaml
index c3a2e70890..a8ca3080c5 100644
--- a/.tekton/kserve-agent-nightly-pull-request.yaml
+++ b/.tekton/kserve-agent-nightly-pull-request.yaml
@@ -8,7 +8,7 @@ metadata:
     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"
+      == "master" && (!".tekton/*.*".pathChanged() || ".tekton/kserve-agent-nightly-pull-request.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
diff --git a/.tekton/kserve-agent-nightly-push.yaml b/.tekton/kserve-agent-nightly-push.yaml
index 3e0152e1bb..3df607839c 100644
--- a/.tekton/kserve-agent-nightly-push.yaml
+++ b/.tekton/kserve-agent-nightly-push.yaml
@@ -7,7 +7,7 @@ metadata:
     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"
+      == "master" && (!".tekton/*.*".pathChanged() || ".tekton/kserve-agent-nightly-push.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
@@ -22,7 +22,7 @@ spec:
   - name: git-url
     value: '{{source_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhoai-tenant/kserve-nightly/kserve-agent-nightly:{{revision}}
+    value: quay.io/modh/kserve-agent:nightly
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/kserve-controller-nightly-pull-request.yaml b/.tekton/kserve-controller-nightly-pull-request.yaml
index 22b7fbe1b8..3ebcfb4063 100644
--- a/.tekton/kserve-controller-nightly-pull-request.yaml
+++ b/.tekton/kserve-controller-nightly-pull-request.yaml
@@ -8,7 +8,7 @@ metadata:
     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"
+      == "master" && (!".tekton/*.*".pathChanged() || ".tekton/kserve-controller-nightly-pull-request.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
diff --git a/.tekton/kserve-controller-nightly-push.yaml b/.tekton/kserve-controller-nightly-push.yaml
index b0df5c333b..741dcd6b40 100644
--- a/.tekton/kserve-controller-nightly-push.yaml
+++ b/.tekton/kserve-controller-nightly-push.yaml
@@ -7,7 +7,7 @@ metadata:
     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"
+      == "master" && (!".tekton/*.*".pathChanged() || ".tekton/kserve-controller-nightly-push.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
@@ -22,7 +22,7 @@ spec:
   - name: git-url
     value: '{{source_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhoai-tenant/kserve-nightly/kserve-controller-nightly:{{revision}}
+    value: quay.io/modh/kserve-controller:nightly
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/kserve-router-nightly-pull-request.yaml b/.tekton/kserve-router-nightly-pull-request.yaml
index fd0a69d710..eeff204cfa 100644
--- a/.tekton/kserve-router-nightly-pull-request.yaml
+++ b/.tekton/kserve-router-nightly-pull-request.yaml
@@ -8,7 +8,7 @@ metadata:
     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"
+      == "master" && (!".tekton/*.*".pathChanged() || ".tekton/kserve-router-nightly-pull-request.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
diff --git a/.tekton/kserve-router-nightly-push.yaml b/.tekton/kserve-router-nightly-push.yaml
index d93be2da9e..6c44b546ef 100644
--- a/.tekton/kserve-router-nightly-push.yaml
+++ b/.tekton/kserve-router-nightly-push.yaml
@@ -7,7 +7,7 @@ metadata:
     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"
+      == "master" && (!".tekton/*.*".pathChanged() || ".tekton/kserve-router-nightly-push.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
@@ -22,7 +22,7 @@ spec:
   - name: git-url
     value: '{{source_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhoai-tenant/kserve-nightly/kserve-router-nightly:{{revision}}
+    value: quay.io/modh/kserve-router:nightly
   - name: path-context
     value: .
   - name: revision
diff --git a/.tekton/kserve-storage-initializer-nightly-pull-request.yaml b/.tekton/kserve-storage-initializer-nightly-pull-request.yaml
index 45140db647..89f0aa7986 100644
--- a/.tekton/kserve-storage-initializer-nightly-pull-request.yaml
+++ b/.tekton/kserve-storage-initializer-nightly-pull-request.yaml
@@ -8,8 +8,8 @@ metadata:
     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-nightly-pull-request.yaml".pathChanged()
-      || "storage-initializer.Dockerfile".pathChanged() )
+      == "master" && ( "python/***".pathChanged() || ".tekton/kserve-storage-initializer-nightly-pull-request.yaml".pathChanged()
+      ) && (!".tekton/*.*".pathChanged() || ".tekton/kserve-storage-initializer-nightly-pull-request.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
diff --git a/.tekton/kserve-storage-initializer-nightly-push.yaml b/.tekton/kserve-storage-initializer-nightly-push.yaml
index 5188823752..bc0e17de06 100644
--- a/.tekton/kserve-storage-initializer-nightly-push.yaml
+++ b/.tekton/kserve-storage-initializer-nightly-push.yaml
@@ -7,7 +7,7 @@ metadata:
     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"
+      == "master" && (!".tekton/*.*".pathChanged() || ".tekton/kserve-storage-initializer-nightly-push.yaml".pathChanged()) && !"config/overlays/odh/params.env".pathChanged()
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: kserve-nightly
@@ -22,7 +22,7 @@ spec:
   - name: git-url
     value: '{{source_url}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/rhoai-tenant/kserve-nightly/kserve-storage-initializer-nightly:{{revision}}
+    value: quay.io/modh/kserve-storage-initializer:nightly
   - name: path-context
     value: python
   - name: revision