diff --git a/.tekton/coreos-assembler-pull-request.yaml b/.tekton/coreos-assembler-pull-request.yaml
index b722199aa1..9642c997f3 100644
--- a/.tekton/coreos-assembler-pull-request.yaml
+++ b/.tekton/coreos-assembler-pull-request.yaml
@@ -35,15 +35,15 @@ spec:
   - name: path-context
     value: .
   - name: hermetic
-    value: false
+    value: "false"
   - name: prefetch-input
-    value: '[{"type": "rpm", "path": "ci/hermetic"}, {"path": "ci/hermetic", "type": "generic"}]'
-  # Note: to be removed once rpm fully supported
-  # https://github.com/hermetoproject/hermeto?tab=readme-ov-file#package-managers
+    value: '[{"type": "rpm", "path": "ci/hermetic"}, {"path": "ci/hermetic", "type":
+      "generic"}]'
   - name: dev-package-managers
-    value: true
+    value: "true"
   - name: build-args
-    value: ["NO_NETWORK=1"]
+    value:
+    - NO_NETWORK=1
   pipelineRef:
     params:
     - name: bundle
@@ -53,6 +53,8 @@ spec:
     - name: kind
       value: pipeline
     resolver: bundles
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-coreos-assembler
   workspaces:
   - name: git-auth
     secret:
diff --git a/.tekton/coreos-assembler-push.yaml b/.tekton/coreos-assembler-push.yaml
index 2fc57370df..dc22a170ca 100644
--- a/.tekton/coreos-assembler-push.yaml
+++ b/.tekton/coreos-assembler-push.yaml
@@ -32,15 +32,15 @@ spec:
   - name: path-context
     value: .
   - name: hermetic
-    value: false
+    value: "false"
   - name: prefetch-input
-    value: '[{"type": "rpm", "path": "ci/hermetic"}, {"path": "ci/hermetic", "type": "generic"}]'
-  # Note: to be removed once rpm fully supported
-  # https://github.com/hermetoproject/hermeto?tab=readme-ov-file#package-managers
+    value: '[{"type": "rpm", "path": "ci/hermetic"}, {"path": "ci/hermetic", "type":
+      "generic"}]'
   - name: dev-package-managers
-    value: true
+    value: "true"
   - name: build-args
-    value: ["NO_NETWORK=1"]
+    value:
+    - NO_NETWORK=1
   pipelineRef:
     params:
     - name: bundle
@@ -50,6 +50,8 @@ spec:
     - name: kind
       value: pipeline
     resolver: bundles
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-coreos-assembler
   workspaces:
   - name: git-auth
     secret: