diff --git a/.tekton/openshift-gitops-operator-bundle-pull-request.yaml b/.tekton/openshift-gitops-operator-bundle-pull-request.yaml
index af35771e3..7c6836c27 100644
--- a/.tekton/openshift-gitops-operator-bundle-pull-request.yaml
+++ b/.tekton/openshift-gitops-operator-bundle-pull-request.yaml
@@ -7,14 +7,9 @@ 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" &&
-      (
-        files.all.exists(x, x.matches('bundle/')) ||
-        files.all.exists(x, x.matches('bundle.Dockerfile')) ||
-        files.all.exists(x, x.matches('.tekton/openshift-gitops-operator-bundle-pull-request.yaml'))
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: "event == \"pull_request\" && \ntarget_branch
+      == \"master\" &&\n(\n  files.all.exists(x, x.matches('bundle/')) ||\n  files.all.exists(x,
+      x.matches('bundle.Dockerfile')) ||\n  files.all.exists(x, x.matches('.tekton/openshift-gitops-operator-bundle-pull-request.yaml'))\n)\n"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: openshift-gitops-operator
@@ -35,10 +30,10 @@ spec:
   - name: dockerfile
     value: bundle.Dockerfile
   - name: hermetic
-    value: true
+    value: "true"
   - name: build-platforms
     value:
-      - linux/x86_64
+    - linux/x86_64
   pipelineSpec:
     description: |
       This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
@@ -469,7 +464,8 @@ spec:
       optional: true
     - name: netrc
       optional: true
-  taskRunTemplate: {}
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-openshift-gitops-operator-bundle
   workspaces:
   - name: git-auth
     secret:
diff --git a/.tekton/openshift-gitops-operator-bundle-push.yaml b/.tekton/openshift-gitops-operator-bundle-push.yaml
index 1f25bd01b..657bd8335 100644
--- a/.tekton/openshift-gitops-operator-bundle-push.yaml
+++ b/.tekton/openshift-gitops-operator-bundle-push.yaml
@@ -6,14 +6,9 @@ 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" &&
-      (
-        files.all.exists(x, x.matches('bundle/')) ||
-        files.all.exists(x, x.matches('bundle.Dockerfile')) ||
-        files.all.exists(x, x.matches('.tekton/openshift-gitops-operator-bundle-push.yaml'))
-      )
+    pipelinesascode.tekton.dev/on-cel-expression: "event == \"push\" && \ntarget_branch
+      == \"master\" &&\n(\n  files.all.exists(x, x.matches('bundle/')) ||\n  files.all.exists(x,
+      x.matches('bundle.Dockerfile')) ||\n  files.all.exists(x, x.matches('.tekton/openshift-gitops-operator-bundle-push.yaml'))\n)\n"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: openshift-gitops-operator
@@ -32,13 +27,13 @@ spec:
   - name: dockerfile
     value: bundle.Dockerfile
   - name: hermetic
-    value: true
+    value: "true"
   - name: build-platforms
     value:
-      - linux/x86_64
-      - linux/arm64
-      - linux/ppc64le
-      - linux/s390x
+    - linux/x86_64
+    - linux/arm64
+    - linux/ppc64le
+    - linux/s390x
   pipelineSpec:
     description: |
       This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
@@ -469,7 +464,8 @@ spec:
       optional: true
     - name: netrc
       optional: true
-  taskRunTemplate: {}
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-openshift-gitops-operator-bundle
   workspaces:
   - name: git-auth
     secret: