diff --git a/.tekton/jboss-eap81-openjdk21-builder-pull-request.yaml b/.tekton/jboss-eap81-openjdk21-builder-pull-request.yaml
index 84c045a..8650ae0 100644
--- a/.tekton/jboss-eap81-openjdk21-builder-pull-request.yaml
+++ b/.tekton/jboss-eap81-openjdk21-builder-pull-request.yaml
@@ -33,7 +33,7 @@ spec:
     - linux/x86_64
     - linux/arm64
     - linux/ppc64le
-    - linux/s390x    
+    - linux/s390x
   - name: dockerfile
     value: Dockerfile
   - name: path-context
@@ -119,7 +119,7 @@ spec:
       - linux/x86_64
       - linux/arm64
       - linux/ppc64le
-      - linux/s390x      
+      - linux/s390x
       description: List of platforms to build the container images on. The available
         set of values is determined by the configuration of the multi-platform-controller.
       name: build-platforms
@@ -606,7 +606,8 @@ spec:
       optional: true
     - name: netrc
       optional: true
-  taskRunTemplate: {}
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-jboss-eap81-openjdk21-builder
   workspaces:
   - name: git-auth
     secret:
diff --git a/.tekton/jboss-eap81-openjdk21-builder-push.yaml b/.tekton/jboss-eap81-openjdk21-builder-push.yaml
index 890d4dd..cb03f4a 100644
--- a/.tekton/jboss-eap81-openjdk21-builder-push.yaml
+++ b/.tekton/jboss-eap81-openjdk21-builder-push.yaml
@@ -28,7 +28,7 @@ spec:
     - linux/x86_64
     - linux/arm64
     - linux/ppc64le
-    - linux/s390x    
+    - linux/s390x
   - name: dockerfile
     value: Dockerfile
   - name: path-context
@@ -114,7 +114,7 @@ spec:
       - linux/x86_64
       - linux/arm64
       - linux/ppc64le
-      - linux/s390x      
+      - linux/s390x
       description: List of platforms to build the container images on. The available
         set of values is determined by the configuration of the multi-platform-controller.
       name: build-platforms
@@ -601,7 +601,8 @@ spec:
       optional: true
     - name: netrc
       optional: true
-  taskRunTemplate: {}
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-jboss-eap81-openjdk21-builder
   workspaces:
   - name: git-auth
     secret: