diff --git a/.tekton/training-py311-rocm62-torch241-push.yaml b/.tekton/training-py311-rocm62-torch241-push.yaml
index f880cfed..8906ba90 100644
--- a/.tekton/training-py311-rocm62-torch241-push.yaml
+++ b/.tekton/training-py311-rocm62-torch241-push.yaml
@@ -7,10 +7,9 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: |
-      event == "push" 
-      && target_branch == "main" 
-      && ( "images/runtime/training/py311-rocm62-torch241/**".pathChanged() || ".tekton/training-py311-rocm62-torch241-push.yaml".pathChanged() )
+    pipelinesascode.tekton.dev/on-cel-expression: "event == \"push\" \n&& target_branch
+      == \"main\" \n&& ( \"images/runtime/training/py311-rocm62-torch241/**\".pathChanged()
+      || \".tekton/training-py311-rocm62-torch241-push.yaml\".pathChanged() )\n"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: runtime-training
@@ -19,8 +18,6 @@ metadata:
   name: training-py311-rocm62-torch241-on-push
   namespace: rhoai-tenant
 spec:
-  timeouts:
-    pipeline: 10h
   params:
   - name: git-url
     value: '{{source_url}}'
@@ -58,9 +55,9 @@ spec:
           value: task
         resolver: bundles
     params:
-    - name: additional-tag
+    - description: Additional fixed tag for the image
+      name: additional-tag
       type: string
-      description: Additional fixed tag for the image
     - description: Source Repository URL
       name: git-url
       type: string
@@ -214,9 +211,7 @@ spec:
         workspace: git-auth
       - name: netrc
         workspace: netrc
-    - name: build-images
-      timeout: 5h
-      matrix:
+    - matrix:
         params:
         - name: PLATFORM
           value:
@@ -261,6 +256,7 @@ spec:
         - name: kind
           value: task
         resolver: bundles
+      timeout: 5h0m0s
       when:
       - input: $(tasks.init.results.build)
         operator: in
@@ -368,7 +364,6 @@ spec:
         values:
         - "false"
     - name: ecosystem-cert-preflight-checks
-      timeout: 2h
       params:
       - name: image-url
         value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -383,6 +378,7 @@ spec:
         - name: kind
           value: task
         resolver: bundles
+      timeout: 2h0m0s
       when:
       - input: $(params.skip-checks)
         operator: in
@@ -415,7 +411,6 @@ spec:
         values:
         - "false"
     - name: clamav-scan
-      timeout: 2h
       params:
       - name: image-digest
         value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -432,6 +427,7 @@ spec:
         - name: kind
           value: task
         resolver: bundles
+      timeout: 2h0m0s
       when:
       - input: $(params.skip-checks)
         operator: in
@@ -561,7 +557,7 @@ spec:
         value: $(tasks.build-image-index.results.IMAGE_URL)
       - name: ADDITIONAL_TAGS
         value:
-          - "$(params.additional-tag)"
+        - $(params.additional-tag)
       runAfter:
       - build-image-index
       taskRef:
@@ -623,7 +619,10 @@ spec:
       optional: true
     - name: netrc
       optional: true
-  taskRunTemplate: {}
+  taskRunTemplate:
+    serviceAccountName: build-pipeline-training-py311-rocm62-torch241
+  timeouts:
+    pipeline: 10h0m0s
   workspaces:
   - name: git-auth
     secret: