diff --git a/.tekton/bpfman-agent-pull-request.yaml b/.tekton/bpfman-agent-pull-request.yaml
index 91c40f7fd..c1eb077ca 100644
--- a/.tekton/bpfman-agent-pull-request.yaml
+++ b/.tekton/bpfman-agent-pull-request.yaml
@@ -8,7 +8,9 @@ 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 == "main" &&
-      (".tekton/***".pathChanged() ||
+      (".tekton/multi-arch-build-pipeline.yaml".pathChanged() ||
+      ".tekton/bpfman-agent-pull-request.yaml".pathChanged() ||
+      ".tekton/bpfman-agent-push.yaml".pathChanged() ||
       "apis/***".pathChanged() ||
       "controllers/***".pathChanged() ||
       "cmd/***".pathChanged() ||
diff --git a/.tekton/bpfman-agent-push.yaml b/.tekton/bpfman-agent-push.yaml
index 8af13dadd..e028f5a42 100644
--- a/.tekton/bpfman-agent-push.yaml
+++ b/.tekton/bpfman-agent-push.yaml
@@ -5,10 +5,12 @@ metadata:
     build.appstudio.openshift.io/repo: https://github.com/bpfman/bpfman-operator?rev={{revision}}
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
-    build.appstudio.openshift.io/build-nudge-files: "hack/update_bundle.sh"
+    build.appstudio.openshift.io/build-nudge-files: "hack/update_configmap.sh"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" &&
-     (".tekton/***".pathChanged() ||
+     (".tekton/multi-arch-build-pipeline.yaml".pathChanged() ||
+      ".tekton/bpfman-agent-pull-request.yaml".pathChanged() ||
+      ".tekton/bpfman-agent-push.yaml".pathChanged() ||
       "apis/***".pathChanged() ||
       "controllers/***".pathChanged() ||
       "cmd/***".pathChanged() ||
diff --git a/.tekton/bpfman-operator-bundle-pull-request.yaml b/.tekton/bpfman-operator-bundle-pull-request.yaml
index 7d2569b56..f310215e0 100644
--- a/.tekton/bpfman-operator-bundle-pull-request.yaml
+++ b/.tekton/bpfman-operator-bundle-pull-request.yaml
@@ -8,11 +8,12 @@ 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 == "main" &&
-      (".tekton/***".pathChanged() ||
+      (".tekton/single-arch-build-pipeline.yaml".pathChanged() || 
+      ".tekton/bpfman-operator-bundle-pull-request.yaml".pathChanged() || 
+      ".tekton/bpfman-operator-bundle-push.yaml".pathChanged() || 
       "Containerfile.bundle.openshift".pathChanged() ||
       "bundle/***".pathChanged() ||
-      "hack/update_bundle.sh".pathChanged() ||
-      "hack/update_configmap.sh".pathChanged())
+      "hack/***".pathChanged())
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: bpfman-operator
diff --git a/.tekton/bpfman-operator-bundle-push.yaml b/.tekton/bpfman-operator-bundle-push.yaml
index aab3b2222..487e9eb24 100644
--- a/.tekton/bpfman-operator-bundle-push.yaml
+++ b/.tekton/bpfman-operator-bundle-push.yaml
@@ -7,11 +7,12 @@ 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 == "main"  &&
-      (".tekton/***".pathChanged() ||
+      (".tekton/single-arch-build-pipeline.yaml".pathChanged() || 
+      ".tekton/bpfman-operator-bundle-pull-request.yaml".pathChanged() || 
+      ".tekton/bpfman-operator-bundle-push.yaml".pathChanged() || 
       "Containerfile.bundle.openshift".pathChanged() ||
       "bundle/***".pathChanged() ||
-      "hack/update_bundle.sh".pathChanged() ||
-      "hack/update_configmap.sh".pathChanged())
+      "hack/***".pathChanged())
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: bpfman-operator
diff --git a/.tekton/bpfman-operator-catalog-pull-request.yaml b/.tekton/bpfman-operator-catalog-pull-request.yaml
index ac6bc6e7a..96bf45384 100644
--- a/.tekton/bpfman-operator-catalog-pull-request.yaml
+++ b/.tekton/bpfman-operator-catalog-pull-request.yaml
@@ -8,11 +8,9 @@ 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 == "main" &&
-      (".tekton/***".pathChanged() ||
+      (".tekton/bpfman-operator-catalog-pull-request.yaml".pathChanged() ||
       "Containerfile.catalog.openshift".pathChanged() ||
-      "catalog/***".pathChanged() ||
-      "hack/update_bundle.sh".pathChanged() ||
-      "hack/update_configmap.sh".pathChanged())
+      "catalog/***".pathChanged())
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fbc-4-17
diff --git a/.tekton/bpfman-operator-catalog-push.yaml b/.tekton/bpfman-operator-catalog-push.yaml
index 0c83378bb..b91ae4baa 100644
--- a/.tekton/bpfman-operator-catalog-push.yaml
+++ b/.tekton/bpfman-operator-catalog-push.yaml
@@ -6,12 +6,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 == "main" &&
-      (".tekton/***".pathChanged() ||
-      "Containerfile.catalog.openshift".pathChanged() ||
-      "catalog/***".pathChanged() ||
-      "hack/update_bundle.sh".pathChanged() ||
-      "hack/update_configmap.sh".pathChanged())
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: fbc-4-17
diff --git a/.tekton/bpfman-operator-pull-request.yaml b/.tekton/bpfman-operator-pull-request.yaml
index 0c7c69a8a..7a5072ca4 100644
--- a/.tekton/bpfman-operator-pull-request.yaml
+++ b/.tekton/bpfman-operator-pull-request.yaml
@@ -8,7 +8,9 @@ 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 == "main" &&
-      (".tekton/***".pathChanged() ||
+       (".tekton/multi-arch-build-pipeline.yaml".pathChanged() ||
+      ".tekton/bpfman-operator-pull-request.yaml".pathChanged() ||
+      ".tekton/bpfman-operator-push.yaml".pathChanged() ||
       "apis/***".pathChanged() ||
       "controllers/***".pathChanged() ||
       "cmd/***".pathChanged() ||
diff --git a/.tekton/bpfman-operator-push.yaml b/.tekton/bpfman-operator-push.yaml
index b4391f89b..9cf57a8a9 100644
--- a/.tekton/bpfman-operator-push.yaml
+++ b/.tekton/bpfman-operator-push.yaml
@@ -8,7 +8,9 @@ metadata:
     build.appstudio.openshift.io/build-nudge-files: "hack/update_bundle.sh"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main" &&
-      (".tekton/***".pathChanged() ||
+      (".tekton/multi-arch-build-pipeline.yaml".pathChanged() ||
+      ".tekton/bpfman-operator-pull-request.yaml".pathChanged() ||
+      ".tekton/bpfman-operator-push.yaml".pathChanged() ||
       "apis/***".pathChanged() ||
       "controllers/***".pathChanged() ||
       "cmd/***".pathChanged() ||
@@ -20,8 +22,6 @@ metadata:
       "pkg/***".pathChanged() ||
       "internal/***".pathChanged() ||
       "test/***".pathChanged() ||
-      "internal/***".pathChanged() ||
-      "test/***".pathChanged() ||
       "vendor/***".pathChanged())
   creationTimestamp: null
   labels: