diff --git a/.tekton/text-generation-inference-pull-request.yaml b/.tekton/text-generation-inference-pull-request.yaml
index 98812405..5b35c1cb 100644
--- a/.tekton/text-generation-inference-pull-request.yaml
+++ b/.tekton/text-generation-inference-pull-request.yaml
@@ -426,7 +426,8 @@ spec:
     - name: workspace
     - name: git-auth
       optional: true
-  taskRunTemplate: {}
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-text-generation-inference
   workspaces:
   - name: workspace
     volumeClaimTemplate:
diff --git a/.tekton/text-generation-inference-push.yaml b/.tekton/text-generation-inference-push.yaml
index 2b62ad05..fef5e68e 100644
--- a/.tekton/text-generation-inference-push.yaml
+++ b/.tekton/text-generation-inference-push.yaml
@@ -16,8 +16,6 @@ metadata:
   name: text-generation-inference-on-push
   namespace: rhoai-tenant
 spec:
-  timeouts:
-    pipeline: 8h
   params:
   - name: git-url
     value: '{{source_url}}'
@@ -241,7 +239,7 @@ spec:
         - name: kind
           value: task
         resolver: bundles
-      timeout: 6h
+      timeout: 6h0m0s
       when:
       - input: $(tasks.init.results.build)
         operator: in
@@ -428,7 +426,10 @@ spec:
     - name: workspace
     - name: git-auth
       optional: true
-  taskRunTemplate: {}
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-text-generation-inference
+  timeouts:
+    pipeline: 8h0m0s
   workspaces:
   - name: workspace
     volumeClaimTemplate: