ci: format all YAML with `yq`

`yq` is the YAML query tool, used for manipulating YAML files. This
change uses the following command to read in and to pretty-print every
YAML file in this repository:

    for x in $(find . -name '*.yaml'); do
        yq -i -P -oy $x
    done

This makes it a bit easier to automate synchronisation between staging
and upstream, as yq always pretty-prints the entire document when
manipulating files.

Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: If973766fa26500d5320612422d1b4999b23439d3
diff --git a/TF-A-LTS.yaml b/TF-A-LTS.yaml
index 7b7d99a..985de89 100644
--- a/TF-A-LTS.yaml
+++ b/TF-A-LTS.yaml
@@ -5,10 +5,10 @@
     filter-queue: true
     filter-executors: true
     columns:
-        - status
-        - weather
-        - job
-        - last-success
-        - last-failure
-        - last-duration
-        - build-button
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
diff --git a/TF-A-LTS2.10.yaml b/TF-A-LTS2.10.yaml
index 13e0d9d..d9417e7 100644
--- a/TF-A-LTS2.10.yaml
+++ b/TF-A-LTS2.10.yaml
@@ -5,10 +5,10 @@
     filter-queue: true
     filter-executors: true
     columns:
-        - status
-        - weather
-        - job
-        - last-success
-        - last-failure
-        - last-duration
-        - build-button
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
diff --git a/TF-A-LTS2.12.yaml b/TF-A-LTS2.12.yaml
index 19db3ba..6f9278c 100644
--- a/TF-A-LTS2.12.yaml
+++ b/TF-A-LTS2.12.yaml
@@ -5,10 +5,10 @@
     filter-queue: true
     filter-executors: true
     columns:
-        - status
-        - weather
-        - job
-        - last-success
-        - last-failure
-        - last-duration
-        - build-button
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
diff --git a/TF-A-LTS2.8.yaml b/TF-A-LTS2.8.yaml
index 6206391..e3e3a12 100644
--- a/TF-A-LTS2.8.yaml
+++ b/TF-A-LTS2.8.yaml
@@ -5,10 +5,10 @@
     filter-queue: true
     filter-executors: true
     columns:
-        - status
-        - weather
-        - job
-        - last-success
-        - last-failure
-        - last-duration
-        - build-button
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
diff --git a/TF-A.yaml b/TF-A.yaml
index dd5e355..5305a66 100644
--- a/TF-A.yaml
+++ b/TF-A.yaml
@@ -5,10 +5,10 @@
     filter-queue: true
     filter-executors: true
     columns:
-        - status
-        - weather
-        - job
-        - last-success
-        - last-failure
-        - last-duration
-        - build-button
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
diff --git a/arm-ffa-main.yaml b/arm-ffa-main.yaml
index 40f3cf9..9dfe956 100644
--- a/arm-ffa-main.yaml
+++ b/arm-ffa-main.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for the arm-ffa crate
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/arm-ffa'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: rust-spmc/arm-ffa
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,97 +30,96 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/arm-ffa'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_FFA_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the arm-ffa crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,arm-ffa"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: rust-spmc/arm-ffa
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: ARM_FFA_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TEST_FEATURES
+          description: Features the arm-ffa crate will be tested against
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,arm-ffa
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_FFA_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_FFA_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=arm-ffa
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          ARM_FFA_GERRIT_PROJECT=${GERRIT_PROJECT}
+          ARM_FFA_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=arm-ffa
+                TEST_REPO_PROJECT=rust-spmc
+                TEST_FEATURES=${TEST_FEATURES}
+              property-file: tf-a-env.param
diff --git a/arm-fvp-base-pac-main.yaml b/arm-fvp-base-pac-main.yaml
index a37e4ee..87a4f75 100644
--- a/arm-fvp-base-pac-main.yaml
+++ b/arm-fvp-base-pac-main.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for the arm-fvp-base-pac crate
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/arm-fvp-base-pac'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: rust-spmc/arm-fvp-base-pac
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,97 +30,96 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/arm-fvp-base-pac'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_FVP_BASE_PAC_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the arm-fvp-base-pac crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,arm-fvp-base-pac"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: rust-spmc/arm-fvp-base-pac
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: ARM_FVP_BASE_PAC_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TEST_FEATURES
+          description: Features the arm-fvp-base-pac crate will be tested against
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,arm-fvp-base-pac
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_FVP_BASE_PAC_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_FVP_BASE_PAC_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=arm-fvp-base-pac
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          ARM_FVP_BASE_PAC_GERRIT_PROJECT=${GERRIT_PROJECT}
+          ARM_FVP_BASE_PAC_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=arm-fvp-base-pac
+                TEST_REPO_PROJECT=rust-spmc
+                TEST_FEATURES=${TEST_FEATURES}
+              property-file: tf-a-env.param
diff --git a/arm-pl011-uart-main.yaml b/arm-pl011-uart-main.yaml
index a2a4f0c..b7abeb5 100644
--- a/arm-pl011-uart-main.yaml
+++ b/arm-pl011-uart-main.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for the arm-pl011-uart crate
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/arm-pl011-uart'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: rust-spmc/arm-pl011-uart
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,97 +30,96 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/arm-pl011-uart'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_PL011_UART_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the arm-pl011-uart crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,arm-pl011-uart"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: rust-spmc/arm-pl011-uart
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: ARM_PL011_UART_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TEST_FEATURES
+          description: Features the arm-pl011-uart crate will be tested against
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,arm-pl011-uart
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_PL011_UART_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_PL011_UART_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=arm-pl011-uart
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          ARM_PL011_UART_GERRIT_PROJECT=${GERRIT_PROJECT}
+          ARM_PL011_UART_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=arm-pl011-uart
+                TEST_REPO_PROJECT=rust-spmc
+                TEST_FEATURES=${TEST_FEATURES}
+              property-file: tf-a-env.param
diff --git a/arm-psci-main.yaml b/arm-psci-main.yaml
index 2ed64dc..7839834 100644
--- a/arm-psci-main.yaml
+++ b/arm-psci-main.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for the arm-psci crate
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/arm-psci'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: rust-spmc/arm-psci
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,97 +30,96 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/arm-psci'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_PSCI_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the arm-psci crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,arm-psci"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: rust-spmc/arm-psci
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: ARM_PSCI_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TEST_FEATURES
+          description: Features the arm-psci crate will be tested against
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,arm-psci
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_PSCI_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_PSCI_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=arm-psci
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          ARM_PSCI_GERRIT_PROJECT=${GERRIT_PROJECT}
+          ARM_PSCI_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=arm-psci
+                TEST_REPO_PROJECT=rust-spmc
+                TEST_FEATURES=${TEST_FEATURES}
+              property-file: tf-a-env.param
diff --git a/arm-sp805-main.yaml b/arm-sp805-main.yaml
index 761d2f5..8818bda 100644
--- a/arm-sp805-main.yaml
+++ b/arm-sp805-main.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for the arm-sp805 crate
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/arm-sp805'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: rust-spmc/arm-sp805
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,97 +30,96 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/arm-sp805'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_SP805_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the arm-sp805 crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,arm-sp805"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: rust-spmc/arm-sp805
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: ARM_SP805_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TEST_FEATURES
+          description: Features the arm-sp805 crate will be tested against
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,arm-sp805
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_SP805_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_SP805_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=arm-sp805
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          ARM_SP805_GERRIT_PROJECT=${GERRIT_PROJECT}
+          ARM_SP805_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=arm-sp805
+                TEST_REPO_PROJECT=rust-spmc
+                TEST_FEATURES=${TEST_FEATURES}
+              property-file: tf-a-env.param
diff --git a/arm-xlat-main.yaml b/arm-xlat-main.yaml
index ba8b199..3a6885c 100644
--- a/arm-xlat-main.yaml
+++ b/arm-xlat-main.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for the arm-xlat crate
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/arm-xlat'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: rust-spmc/arm-xlat
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,97 +30,96 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/arm-xlat'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_XLAT_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the arm-xlat crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,arm-xlat"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: rust-spmc/arm-xlat
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: ARM_XLAT_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TEST_FEATURES
+          description: Features the arm-xlat crate will be tested against
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,arm-xlat
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_XLAT_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_XLAT_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=arm-xlat
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          ARM_XLAT_GERRIT_PROJECT=${GERRIT_PROJECT}
+          ARM_XLAT_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=arm-xlat
+                TEST_REPO_PROJECT=rust-spmc
+                TEST_FEATURES=${TEST_FEATURES}
+              property-file: tf-a-env.param
diff --git a/firmware-development-guide-main.yaml b/firmware-development-guide-main.yaml
index 007ce1b..2c59c18 100644
--- a/firmware-development-guide-main.yaml
+++ b/firmware-development-guide-main.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for the firmware-development-guide crate
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'rust-spmc/firmware-development-guide'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: rust-spmc/firmware-development-guide
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,97 +30,96 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'rust-spmc/firmware-development-guide'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: ARM_FW_DEV_GUIDE_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: TEST_FEATURES
-            description: 'Features the firmware-development-guide crate will be tested against'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,firmware-development-guide"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: rust-spmc/firmware-development-guide
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: ARM_FW_DEV_GUIDE_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TEST_FEATURES
+          description: Features the firmware-development-guide crate will be tested against
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,firmware-development-guide
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        ARM_FW_DEV_GUIDE_GERRIT_PROJECT=${GERRIT_PROJECT}
-        ARM_FW_DEV_GUIDE_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=firmware-development-guide
-            TEST_REPO_PROJECT=rust-spmc
-            TEST_FEATURES=${TEST_FEATURES}
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          ARM_FW_DEV_GUIDE_GERRIT_PROJECT=${GERRIT_PROJECT}
+          ARM_FW_DEV_GUIDE_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=firmware-development-guide
+                TEST_REPO_PROJECT=rust-spmc
+                TEST_FEATURES=${TEST_FEATURES}
+              property-file: tf-a-env.param
diff --git a/generic-lib-testing.yaml b/generic-lib-testing.yaml
index 0a236a8..f6db716 100644
--- a/generic-lib-testing.yaml
+++ b/generic-lib-testing.yaml
@@ -7,92 +7,91 @@
     defaults: global
     description: Run platform independent tests
     properties:
-        - build-discarder:
-            days-to-keep: 14
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-    - string:
-        name: TF_GERRIT_PROJECT
-        default: 'TF-A/trusted-firmware-a'
-    - string:
-        name: TF_GERRIT_BRANCH
-        default: 'refs/heads/tfa-next'
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-    - string:
-        name: CI_REFSPEC
-        default: 'refs/changes/58/39058/5'
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/tfa-next
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+      - string:
+          name: CI_REFSPEC
+          default: refs/changes/58/39058/5
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
-    - string:
-        name: FETCH_SSH
-        default: 1
-        description: |
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
             Fetch branches with authenticated SSH instead of anonymous HTTPS
-    - string:
-        name: GERRIT_BRANCH
-        default: ''
-    - string:
-        name: CLONE_REPOS
-        default: "tf-a-ci-scripts"
-        description: |
+      - string:
+          name: GERRIT_BRANCH
+          default: ""
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts
+          description: |
             Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras,etc.)
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
-    - string:
-        name: TEST_REPO_PROJECT
-        default: 'rust-spmc'
-    - string:
-        name: TEST_REPO_NAME
-    - string:
-        name: TEST_FEATURES
-        description: 'Features against which the library will be tested'
-    - string:
-        name: SHARE_FOLDER
-        default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-        description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TEST_REPO_PROJECT
+          default: rust-spmc
+      - string:
+          name: TEST_REPO_NAME
+      - string:
+          name: TEST_FEATURES
+          description: Features against which the library will be tested
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - credentials-binding:
-            - ssh-user-private-key:
-                credential-id: TFA_CI_BOT_USER_SSH_KEY
-                key-file-variable: CI_BOT_KEY
-                username-variable: CI_BOT_USERNAME
-                passphrase-variable: ''
-        - timestamps
-        - timeout:
-            timeout: 240
-            fail: true
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - timestamps
+      - timeout:
+          timeout: 240
+          fail: true
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        GERRIT_PROJECT=${TF_GERRIT_PROJECT}
-        GERRIT_BRANCH=${TF_GERRIT_BRANCH}
-        GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
-        EOF
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          GERRIT_PROJECT=${TF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
+          EOF
 
-        cd ${WORKSPACE}
-        # Executed project-related next checks: platform independent tests with a generic platform.
-        IS_CONTINUOUS_INTEGRATION=1 ${WORKSPACE}/tf-a-ci-scripts/script/next-checks/next-checks-generic-tests.sh ${TEST_REPO_PROJECT} ${TEST_REPO_NAME}
+          cd ${WORKSPACE}
+          # Executed project-related next checks: platform independent tests with a generic platform.
+          IS_CONTINUOUS_INTEGRATION=1 ${WORKSPACE}/tf-a-ci-scripts/script/next-checks/next-checks-generic-tests.sh ${TEST_REPO_PROJECT} ${TEST_REPO_NAME}
     publishers:
-        - archive:
-            artifacts: 'next-generic-checks.log'
-        # TODO: it is not possible to give this groovy script the
-        #       auth/permissions required to access next-generic-checks.log
-        #       * uncomment this once the job is made public
-        #       * create the required postbuild.groovy file based on generic-lib-testing/postbuild.groovy
-        # - groovy-postbuild:
-        #     script:
-        #         !include-raw:
-        #           - tf-a-generic-tfa-next/postbuild.groovy
+      - archive:
+          artifacts: next-generic-checks.log
+    # TODO: it is not possible to give this groovy script the
+    #       auth/permissions required to access next-generic-checks.log
+    #       * uncomment this once the job is made public
+    #       * create the required postbuild.groovy file based on generic-lib-testing/postbuild.groovy
+    # - groovy-postbuild:
+    #     script:
+    #         !include-raw:
+    #           - tf-a-generic-tfa-next/postbuild.groovy
diff --git a/libtl-pipeline.yaml b/libtl-pipeline.yaml
index cd5bfed..a5cacbe 100644
--- a/libtl-pipeline.yaml
+++ b/libtl-pipeline.yaml
@@ -6,17 +6,15 @@
     project-type: pipeline
     sandbox: true
     dsl: !include-raw: libtl-pipeline/Jenkinsfile
-
     properties:
       - build-discarder:
           days-to-keep: 4
-
     triggers:
       - gerrit:
           server-name: review.trustedfirmware.org
           trigger-on:
             - comment-added-event:
-                approval-category: "Allow-CI"
+                approval-category: Allow-CI
                 approval-value: 1
           projects:
             - project-compare-type: PLAIN
diff --git a/tf-a-arm-weekly.yaml b/tf-a-arm-weekly.yaml
index 90e5e5e..d3b7a30 100644
--- a/tf-a-arm-weekly.yaml
+++ b/tf-a-arm-weekly.yaml
@@ -1,114 +1,113 @@
 - job:
-    name: tf-a-arm-weekly 
+    name: tf-a-arm-weekly
     node: docker-amd64-tf-a-jammy
     project-type: multijob
     concurrent: true
     disabled: false
     description: CI job for both coverage and fuzzing.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     parameters:
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-           name: SPM_REFSPEC
-           default: '+refs/heads/master:refs/remotes/origin/master'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-           name: RMM_REFSPEC
-           default: '+refs/heads/main:refs/remotes/origin/main'
-           description: |
-             tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: LAVA_PRIORITY
-            default: 'low'
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: LAVA_PRIORITY
+          default: low
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        GERRIT_PROJECT=${TF_GERRIT_PROJECT}
-        GERRIT_BRANCH=${TF_GERRIT_BRANCH}
-        GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-        cat << EOF > tf-a-tests-env.param
-        GERRIT_PROJECT=${TFTF_GERRIT_PROJECT}
-        GERRIT_BRANCH=${TFTF_GERRIT_BRANCH}
-        GERRIT_REFSPEC=${TFTF_GERRIT_REFSPEC}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: TFTF Fuzzing
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l3-fuzzing SDEI
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l3-fuzzing
-          property-file: tf-a-tests-env.param
-    # participate in the job's success/failure.
-    - trigger-builds:
-        - project: tf-a-ci-coverage-gateway
-          block: true
-          current-parameters: true
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          GERRIT_PROJECT=${TF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+          cat << EOF > tf-a-tests-env.param
+          GERRIT_PROJECT=${TFTF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TFTF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TFTF_GERRIT_REFSPEC}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: TFTF Fuzzing
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l3-fuzzing SDEI
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l3-fuzzing
+              property-file: tf-a-tests-env.param
+      # participate in the job's success/failure.
+      - trigger-builds:
+          - project: tf-a-ci-coverage-gateway
+            block: true
+            current-parameters: true
     triggers:
-        - timed: '59 23 * * 7'
+      - timed: 59 23 * * 7
diff --git a/tf-a-artifacts-cleanup.yaml b/tf-a-artifacts-cleanup.yaml
index cc66b80..dde96ee 100644
--- a/tf-a-artifacts-cleanup.yaml
+++ b/tf-a-artifacts-cleanup.yaml
@@ -8,15 +8,15 @@
     description: |
       Gradually cleanup artifacts in TF-A builds
     properties:
-        - build-discarder:
-            days-to-keep: 50
-            num-to-keep: 50
+      - build-discarder:
+          days-to-keep: 50
+          num-to-keep: 50
     triggers:
-        - timed: 'H H/8 * * *'
+      - timed: H H/8 * * *
     wrappers:
-        - timestamps
+      - timestamps
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            find /var/lib/jenkins/jobs/tf-a-builder/builds -name build.log -mtime +5 | head -n1000 | xargs -i -n1 bash -c "echo {}; gzip -9 {}"
+          find /var/lib/jenkins/jobs/tf-a-builder/builds -name build.log -mtime +5 | head -n1000 | xargs -i -n1 bash -c "echo {}; gzip -9 {}"
diff --git a/tf-a-builder-tfa-next.yaml b/tf-a-builder-tfa-next.yaml
index aedfea6..f524801 100644
--- a/tf-a-builder-tfa-next.yaml
+++ b/tf-a-builder-tfa-next.yaml
@@ -8,150 +8,148 @@
     description: |
       Trusted Firmware A (TF-A) builder for Next
     properties:
-        - build-discarder:
-            days-to-keep: 15
-            artifact-num-to-keep: 40000
+      - build-discarder:
+          days-to-keep: 15
+          artifact-num-to-keep: 40000
     parameters:
-        - string:
-            name: import_cc
-        - string:
-            name: TEST_CONFIG
-            description: |
-              Original test configuration.
-        - string:
-            name: TEST_DESC
-            description: |
-              Expanded and normalized test configuration, aka "test description"
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-                tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: DOCKER_REGISTRY
-            default: ${PRIVATE_CONTAINER_REGISTRY}
-            description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
-        - string:
-            name: JUNO_ROOTFS_URL
-            default: 'http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz'
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'tf'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'tf-a'
-        - string:
-            name: QA_SERVER_VERSION
-            default: ${BUILD_NUMBER}
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_TOOLS_REPO
-            default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-        - string:
-            name: QA_TOOLS_BRANCH
-            default: 'master'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,trusted-firmware-a"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: import_cc
+      - string:
+          name: TEST_CONFIG
+          description: |
+            Original test configuration.
+      - string:
+          name: TEST_DESC
+          description: |
+            Expanded and normalized test configuration, aka "test description"
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: DOCKER_REGISTRY
+          default: ${PRIVATE_CONTAINER_REGISTRY}
+          description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
+      - string:
+          name: JUNO_ROOTFS_URL
+          default: http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: QA_SERVER_TEAM
+          default: tf
+      - string:
+          name: QA_SERVER_PROJECT
+          default: tf-a
+      - string:
+          name: QA_SERVER_VERSION
+          default: ${BUILD_NUMBER}
+      - string:
+          name: QA_SERVER
+          default: https://qa-reports.linaro.org
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,trusted-firmware-a
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 120
-            fail: true
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_USER_TF
-                variable: LAVA_USER
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_TOKEN_TF
-                variable: LAVA_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TUXSUITE_TOKEN
-                variable: TUXSUITE_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TUXPUT_ARCHIVE_TOKEN
-                variable: TUXPUT_ARCHIVE_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: ARMCLANG_UBL_CODE
-                variable: ARMCLANG_UBL_CODE
+      - timestamps
+      - timeout:
+          timeout: 120
+          fail: true
+      - credentials-binding:
+          - text:
+              credential-id: QA_REPORTS_TOKEN
+              variable: QA_REPORTS_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_USER_TF
+              variable: LAVA_USER
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_TOKEN_TF
+              variable: LAVA_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: TUXSUITE_TOKEN
+              variable: TUXSUITE_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: TUXPUT_ARCHIVE_TOKEN
+              variable: TUXPUT_ARCHIVE_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: ARMCLANG_UBL_CODE
+              variable: ARMCLANG_UBL_CODE
     builders:
-        - shell: |
-            aarch64-none-elf-gcc -v || true
-        - shell:
-            !include-raw: scripts/clone.sh
-        - shell:
-            !include-raw: tf-a-builder/builders.sh
-        - inject:
-            properties-file: artefacts/env
-        - shell: |
-            ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
-            echo ${BIN_MODE:-release} >lava-binmode.txt
-        - conditional-step:
-            condition-kind: file-exists
-            on-evaluation-failure: dont-run
-            condition-filename: artefacts-lava/job.yaml
-            condition-basedir: workspace
-            steps:
-            - shell:  |
+      - shell: |
+          aarch64-none-elf-gcc -v || true
+      - shell: !include-raw: scripts/clone.sh
+      - shell: !include-raw: tf-a-builder/builders.sh
+      - inject:
+          properties-file: artefacts/env
+      - shell: |
+          ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
+          echo ${BIN_MODE:-release} >lava-binmode.txt
+      - conditional-step:
+          condition-kind: file-exists
+          on-evaluation-failure: dont-run
+          condition-filename: artefacts-lava/job.yaml
+          condition-basedir: workspace
+          steps:
+            - shell: |
                 #!/bin/bash
                 set -e
                 DEVICE_TYPE=fvp
@@ -168,63 +166,62 @@
                 LAVA_SERVER=tf.validation.linaro.org
                 EOF
     publishers:
-        - archive:
-            artifacts: artefacts/**, lava-binmode.txt
-            latest-only: false
-            allow-empty: true
-        - conditional-publisher:
+      - archive:
+          artifacts: artefacts/**, lava-binmode.txt
+          latest-only: false
+          allow-empty: true
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: artefacts-lava/job.yaml
             condition-basedir: workspace
             action:
-                - postbuildscript:
-                    mark-unstable-if-failed: true
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - inject:
-                                properties-file: ${WORKSPACE}/lava.param
-                            - shell: |
-                                #!/bin/bash -x
+              - postbuildscript:
+                  mark-unstable-if-failed: true
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - inject:
+                            properties-file: ${WORKSPACE}/lava.param
+                        - shell: |
+                            #!/bin/bash -x
 
-                                tf-a-job-configs/tf-a-builder/upload-tfa-next-artifacts.sh
-                                tf-a-job-configs/tf-a-builder/submit-test-job.sh
-                                status=$?
-                                tf-a-job-configs/tf-a-builder/lava-log-process.sh
-                                if [ $status -ne 0 ]; then
-                                    echo "LAVA JOB RESULT: 1"
-                                    exit 1
-                                else
-                                    echo "LAVA JOB RESULT: 0"
-                                fi
-                - postbuildscript:
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - shell: |
-                                #!/bin/bash -e
-                                echo "=== Starting expect-post tests ==="
-                                ./tf-a-ci-scripts/script/expect-post-runner.sh
-        - conditional-publisher:
+                            tf-a-job-configs/tf-a-builder/upload-tfa-next-artifacts.sh
+                            tf-a-job-configs/tf-a-builder/submit-test-job.sh
+                            status=$?
+                            tf-a-job-configs/tf-a-builder/lava-log-process.sh
+                            if [ $status -ne 0 ]; then
+                                echo "LAVA JOB RESULT: 1"
+                                exit 1
+                            else
+                                echo "LAVA JOB RESULT: 0"
+                            fi
+              - postbuildscript:
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - shell: |
+                            #!/bin/bash -e
+                            echo "=== Starting expect-post tests ==="
+                            ./tf-a-ci-scripts/script/expect-post-runner.sh
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: lava-raw-debug.log
             condition-basedir: workspace
             action:
-                - archive:
-                    artifacts: lava-raw-debug.log
-                    latest-only: false
-                    allow-empty: true
-        - archive:
-            artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
-            latest-only: false
-            allow-empty: true
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-builder/postbuild.groovy
+              - archive:
+                  artifacts: lava-raw-debug.log
+                  latest-only: false
+                  allow-empty: true
+      - archive:
+          artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
+          latest-only: false
+          allow-empty: true
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-builder/postbuild.groovy
diff --git a/tf-a-builder.yaml b/tf-a-builder.yaml
index 7837209..a4402a5 100644
--- a/tf-a-builder.yaml
+++ b/tf-a-builder.yaml
@@ -8,141 +8,139 @@
     description: |
       Trusted Firmware A (TF-A) builder
     properties:
-        - build-discarder:
-            days-to-keep: 15
-            artifact-num-to-keep: 40000
+      - build-discarder:
+          days-to-keep: 15
+          artifact-num-to-keep: 40000
     parameters:
-        - string:
-            name: import_cc
-        - string:
-            name: TEST_CONFIG
-            description: |
-              Original test configuration.
-        - string:
-            name: TEST_DESC
-            description: |
-              Expanded and normalized test configuration, aka "test description"
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: DOCKER_REGISTRY
-            default: ${PRIVATE_CONTAINER_REGISTRY}
-            description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
-        - string:
-            name: JUNO_ROOTFS_URL
-            default: 'http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz'
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'tf'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'tf-a'
-        - string:
-            name: QA_SERVER_VERSION
-            default: ${BUILD_NUMBER}
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_TOOLS_REPO
-            default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-        - string:
-            name: QA_TOOLS_BRANCH
-            default: 'master'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: import_cc
+      - string:
+          name: TEST_CONFIG
+          description: |
+            Original test configuration.
+      - string:
+          name: TEST_DESC
+          description: |
+            Expanded and normalized test configuration, aka "test description"
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: DOCKER_REGISTRY
+          default: ${PRIVATE_CONTAINER_REGISTRY}
+          description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
+      - string:
+          name: JUNO_ROOTFS_URL
+          default: http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: QA_SERVER_TEAM
+          default: tf
+      - string:
+          name: QA_SERVER_PROJECT
+          default: tf-a
+      - string:
+          name: QA_SERVER_VERSION
+          default: ${BUILD_NUMBER}
+      - string:
+          name: QA_SERVER
+          default: https://qa-reports.linaro.org
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 120
-            fail: true
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_USER_TF
-                variable: LAVA_USER
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_TOKEN_TF
-                variable: LAVA_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TUXSUITE_TOKEN
-                variable: TUXSUITE_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: ARMCLANG_UBL_CODE
-                variable: ARMCLANG_UBL_CODE
+      - timestamps
+      - timeout:
+          timeout: 120
+          fail: true
+      - credentials-binding:
+          - text:
+              credential-id: QA_REPORTS_TOKEN
+              variable: QA_REPORTS_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_USER_TF
+              variable: LAVA_USER
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_TOKEN_TF
+              variable: LAVA_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: TUXSUITE_TOKEN
+              variable: TUXSUITE_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: ARMCLANG_UBL_CODE
+              variable: ARMCLANG_UBL_CODE
     builders:
-        - shell: |
-            aarch64-none-elf-gcc -v || true
-        - shell:
-            !include-raw: scripts/clone.sh
-        - shell:
-            !include-raw: tf-a-builder/builders.sh
-        - inject:
-            properties-file: artefacts/env
-        - shell: |
-            ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
-            echo ${BIN_MODE:-release} >lava-binmode.txt
-        - conditional-step:
-            condition-kind: file-exists
-            on-evaluation-failure: dont-run
-            condition-filename: artefacts-lava/job.yaml
-            condition-basedir: workspace
-            steps:
-            - shell:  |
+      - shell: |
+          aarch64-none-elf-gcc -v || true
+      - shell: !include-raw: scripts/clone.sh
+      - shell: !include-raw: tf-a-builder/builders.sh
+      - inject:
+          properties-file: artefacts/env
+      - shell: |
+          ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
+          echo ${BIN_MODE:-release} >lava-binmode.txt
+      - conditional-step:
+          condition-kind: file-exists
+          on-evaluation-failure: dont-run
+          condition-filename: artefacts-lava/job.yaml
+          condition-basedir: workspace
+          steps:
+            - shell: |
                 #!/bin/bash
                 set -e
                 DEVICE_TYPE=fvp
@@ -153,63 +151,62 @@
                 LAVA_SERVER=tf.validation.linaro.org
                 EOF
     publishers:
-        - archive:
-            artifacts: artefacts/**, lava-binmode.txt
-            latest-only: false
-            allow-empty: true
-            follow-symlinks: true
-        - conditional-publisher:
+      - archive:
+          artifacts: artefacts/**, lava-binmode.txt
+          latest-only: false
+          allow-empty: true
+          follow-symlinks: true
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: artefacts-lava/job.yaml
             condition-basedir: workspace
             action:
-                - postbuildscript:
-                    mark-unstable-if-failed: true
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - inject:
-                                properties-file: ${WORKSPACE}/lava.param
-                            - shell: |
-                                #!/bin/bash -x
+              - postbuildscript:
+                  mark-unstable-if-failed: true
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - inject:
+                            properties-file: ${WORKSPACE}/lava.param
+                        - shell: |
+                            #!/bin/bash -x
 
-                                tf-a-job-configs/tf-a-builder/submit-test-job.sh
-                                status=$?
-                                tf-a-job-configs/tf-a-builder/lava-log-process.sh
-                                if [ $status -ne 0 ]; then
-                                    echo "LAVA JOB RESULT: 1"
-                                    exit 1
-                                else
-                                    echo "LAVA JOB RESULT: 0"
-                                fi
-                - postbuildscript:
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - shell: |
-                                #!/bin/bash -e
-                                echo "=== Starting expect-post tests ==="
-                                ./tf-a-ci-scripts/script/expect-post-runner.sh
-        - conditional-publisher:
+                            tf-a-job-configs/tf-a-builder/submit-test-job.sh
+                            status=$?
+                            tf-a-job-configs/tf-a-builder/lava-log-process.sh
+                            if [ $status -ne 0 ]; then
+                                echo "LAVA JOB RESULT: 1"
+                                exit 1
+                            else
+                                echo "LAVA JOB RESULT: 0"
+                            fi
+              - postbuildscript:
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - shell: |
+                            #!/bin/bash -e
+                            echo "=== Starting expect-post tests ==="
+                            ./tf-a-ci-scripts/script/expect-post-runner.sh
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: lava-raw-debug.log
             condition-basedir: workspace
             action:
-                - archive:
-                    artifacts: lava-raw-debug.log
-                    latest-only: false
-                    allow-empty: true
-        - archive:
-            artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
-            latest-only: false
-            allow-empty: true
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-builder/postbuild.groovy
+              - archive:
+                  artifacts: lava-raw-debug.log
+                  latest-only: false
+                  allow-empty: true
+      - archive:
+          artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
+          latest-only: false
+          allow-empty: true
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-builder/postbuild.groovy
diff --git a/tf-a-ci-coverage-gateway.yaml b/tf-a-ci-coverage-gateway.yaml
index ce45d6d..e5782ab 100644
--- a/tf-a-ci-coverage-gateway.yaml
+++ b/tf-a-ci-coverage-gateway.yaml
@@ -8,128 +8,126 @@
     description: |
       Main job entry point for a Trusted Firmware A with coverage focus(TF-A) CI.
     properties:
-    - build-discarder:
-        days-to-keep: 15
-    - throttle:
-        option: project
-        enabled: true
-        max-per-node: 3
-        max-total: 10
+      - build-discarder:
+          days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-per-node: 3
+          max-total: 10
     wrappers:
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
-    - workspace-cleanup
-    - timeout:
-        timeout: 240
-        fail: true
-    - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - workspace-cleanup
+      - timeout:
+          timeout: 240
+          fail: true
+      - timestamps
     parameters:
-    - string:
-        name: TEST_GROUPS
-        default: tf-l3-code-coverage
-        description: |
-          White space separated list of test configs: can be mix of specific
-          test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
-          group names (e.g., <code>l1 l2</code>).
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          trusted-firmware-a refspec to use. The master branch is used by default.
-    - string:
-        name: TFTF_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-a-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_TESTS_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-m-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_EXTRAS_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-m-extras refspec to use. The master branch is used by default.
-    - string:
-       name: SPM_REFSPEC
-       default: '+refs/heads/master:refs/remotes/origin/master'
-       description: |
-         SPM(Hafnium) refspec to use. The master branch is used by default.
-    - string:
-        name: RMM_REFSPEC
-        default: '+refs/heads/main:refs/remotes/origin/main'
-        description: |
-          tf-rmm refspec to use. The main branch is used by default.
-    - string:
-        name: CI_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-a-ci-scripts refspec to use. The master branch is used by default.
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
-          tf-a-job-configs refspec to use. The master branch is used by default.
-    - bool:
-        name: ENABLE_STATIC_CHECK
-        default: false
-    - string:
-        name: QA_TOOLS_REPO
-        default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-    - string:
-        name: QA_TOOLS_BRANCH
-        default: 'master'
-    - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TEST_GROUPS
+          default: tf-l3-code-coverage
+          description: |
+            White space separated list of test configs: can be mix of specific
+            test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
+            group names (e.g., <code>l1 l2</code>).
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            trusted-firmware-a refspec to use. The master branch is used by default.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-a-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_TESTS_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-m-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_EXTRAS_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-m-extras refspec to use. The master branch is used by default.
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-a-ci-scripts refspec to use. The master branch is used by default.
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - bool:
+          name: ENABLE_STATIC_CHECK
+          default: false
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        CI_ROOT=${PWD}/tf-a-ci-scripts
-        export workspace=$PWD
-        export test_groups=$TEST_GROUPS
-        $CI_ROOT/script/gen_test_desc.py
-        cat << EOF > share.param
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - trigger-builds:
-      - project:
-        - tf-a-builder
-        block: true
-        property-file: share.param
-        current-parameters: true
-        property-file-fail-on-missing: false
-        parameter-factories:
-        - factory: filebuild
-          file-pattern: '*.testprop'
-          no-files-found-action: FAIL
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          CI_ROOT=${PWD}/tf-a-ci-scripts
+          export workspace=$PWD
+          export test_groups=$TEST_GROUPS
+          $CI_ROOT/script/gen_test_desc.py
+          cat << EOF > share.param
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - trigger-builds:
+          - project:
+              - tf-a-builder
+            block: true
+            property-file: share.param
+            current-parameters: true
+            property-file-fail-on-missing: false
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: '*.testprop'
+                no-files-found-action: FAIL
     publishers:
-        - postbuildscript:
-            builders:
-                - role: SLAVE
-                  build-on:
-                      - SUCCESS
-                      - FAILURE
-                      - UNSTABLE
-                      - ABORTED
-                      - NOT_BUILT
-                  build-steps:
-                      - shell: |-
-                          #!/bin/bash -e
-                          export CI_ROOT=${PWD}/tf-a-ci-scripts
-                          bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
-        - archive:
-            artifacts: report.json, report.html, merge/outdir/**
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-ci-gateway/postbuild.groovy
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - UNSTABLE
+                - ABORTED
+                - NOT_BUILT
+              build-steps:
+                - shell: |-
+                    #!/bin/bash -e
+                    export CI_ROOT=${PWD}/tf-a-ci-scripts
+                    bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
+      - archive:
+          artifacts: report.json, report.html, merge/outdir/**
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-ci-gateway/postbuild.groovy
diff --git a/tf-a-ci-gateway-tfa-next.yaml b/tf-a-ci-gateway-tfa-next.yaml
index 023da8a..e13e5bb 100644
--- a/tf-a-ci-gateway-tfa-next.yaml
+++ b/tf-a-ci-gateway-tfa-next.yaml
@@ -8,138 +8,136 @@
     description: |
       Main job entry point for a Trusted Firmware A Next (TF-A) CI
     properties:
-    - build-discarder:
-        days-to-keep: 15
-    - throttle:
-        option: project
-        enabled: true
-        max-per-node: 3
-        max-total: 10
+      - build-discarder:
+          days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-per-node: 3
+          max-total: 10
     wrappers:
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
-    - workspace-cleanup
-    - timeout:
-        timeout: 240
-        fail: true
-    - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - workspace-cleanup
+      - timeout:
+          timeout: 240
+          fail: true
+      - timestamps
     parameters:
-    - string:
-        name: TEST_GROUPS
-        default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
-        description: |
-          White space separated list of test configs: can be mix of specific
-          test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
-          group names (e.g., <code>l1 l2</code>).
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          trusted-firmware-a refspec to use. The master branch is used by default.
-    - string:
-        name: TFTF_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-a-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_TESTS_GERRIT_REFSPEC
-        default: '+refs/heads/main:refs/remotes/origin/main'
-        description: |
-          tf-m-tests refspec to use. The main branch is used by default.
-    - string:
-        name: TF_M_EXTRAS_GERRIT_REFSPEC
-        default: '+refs/heads/main:refs/remotes/origin/main'
-        description: |
-          tf-m-extras refspec to use. The main branch is used by default.
-    - string:
-       name: SPM_REFSPEC
-       default: '+refs/heads/master:refs/remotes/origin/master'
-       description: |
-         SPM(Hafnium) refspec to use. The master branch is used by default.
-    - string:
-        name: RMM_REFSPEC
-        default: '+refs/heads/main:refs/remotes/origin/main'
-        description: |
-          tf-rmm refspec to use. The main branch is used by default.
-    - string:
-        name: CI_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-a-ci-scripts refspec to use. The master branch is used by default.
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
+      - string:
+          name: TEST_GROUPS
+          default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
+          description: |
+            White space separated list of test configs: can be mix of specific
+            test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
+            group names (e.g., <code>l1 l2</code>).
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            trusted-firmware-a refspec to use. The master branch is used by default.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-a-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_TESTS_GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-m-tests refspec to use. The main branch is used by default.
+      - string:
+          name: TF_M_EXTRAS_GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-m-extras refspec to use. The main branch is used by default.
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-a-ci-scripts refspec to use. The master branch is used by default.
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
-    - bool:
-        name: ENABLE_STATIC_CHECK
-        default: false
-    - string:
-        name: QA_TOOLS_REPO
-        default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-    - string:
-        name: QA_TOOLS_BRANCH
-        default: 'master'
-    - string:
-        name: USE_TUXSUITE_FVP
-        default: 1
-        description: |
-          Whether to submit FVP tests via TuxSuite (instead of LAVA)
-    - string:
-        name: CLONE_REPOS
-        default: "tf-a-ci-scripts,trusted-firmware-a"
-        description: |
+      - bool:
+          name: ENABLE_STATIC_CHECK
+          default: false
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,trusted-firmware-a
+          description: |
             Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
-    - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        CI_ROOT=${PWD}/tf-a-ci-scripts
-        export workspace=$PWD
-        export test_groups=$TEST_GROUPS
-        $CI_ROOT/script/gen_test_desc.py
-        cat << EOF > share.param
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - trigger-builds:
-      - project:
-        - tf-a-builder-tfa-next
-        block: true
-        property-file: share.param
-        current-parameters: true
-        property-file-fail-on-missing: false
-        parameter-factories:
-        - factory: filebuild
-          file-pattern: '*.testprop'
-          no-files-found-action: FAIL
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          CI_ROOT=${PWD}/tf-a-ci-scripts
+          export workspace=$PWD
+          export test_groups=$TEST_GROUPS
+          $CI_ROOT/script/gen_test_desc.py
+          cat << EOF > share.param
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - trigger-builds:
+          - project:
+              - tf-a-builder-tfa-next
+            block: true
+            property-file: share.param
+            current-parameters: true
+            property-file-fail-on-missing: false
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: '*.testprop'
+                no-files-found-action: FAIL
     publishers:
-        - postbuildscript:
-            builders:
-                - role: SLAVE
-                  build-on:
-                      - SUCCESS
-                      - FAILURE
-                      - UNSTABLE
-                      - ABORTED
-                      - NOT_BUILT
-                  build-steps:
-                      - shell: |-
-                          #!/bin/bash -e
-                          export CI_ROOT=${PWD}/tf-a-ci-scripts
-                          bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
-        - archive:
-            artifacts: report.json, report.html, merge/outdir/**
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-ci-gateway/postbuild.groovy
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - UNSTABLE
+                - ABORTED
+                - NOT_BUILT
+              build-steps:
+                - shell: |-
+                    #!/bin/bash -e
+                    export CI_ROOT=${PWD}/tf-a-ci-scripts
+                    bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
+      - archive:
+          artifacts: report.json, report.html, merge/outdir/**
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-ci-gateway/postbuild.groovy
diff --git a/tf-a-ci-gateway.yaml b/tf-a-ci-gateway.yaml
index 15b14f0..7583b7c 100644
--- a/tf-a-ci-gateway.yaml
+++ b/tf-a-ci-gateway.yaml
@@ -8,133 +8,131 @@
     description: |
       Main job entry point for a Trusted Firmware A (TF-A) CI.
     properties:
-    - build-discarder:
-        days-to-keep: 15
-    - throttle:
-        option: project
-        enabled: true
-        max-per-node: 3
-        max-total: 10
+      - build-discarder:
+          days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-per-node: 3
+          max-total: 10
     wrappers:
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
-    - workspace-cleanup
-    - timeout:
-        timeout: 240
-        fail: true
-    - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - workspace-cleanup
+      - timeout:
+          timeout: 240
+          fail: true
+      - timestamps
     parameters:
-    - string:
-        name: TEST_GROUPS
-        default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
-        description: |
-          White space separated list of test configs: can be mix of specific
-          test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
-          group names (e.g., <code>l1 l2</code>).
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          trusted-firmware-a refspec to use. The master branch is used by default.
-    - string:
-        name: TFTF_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-a-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_TESTS_GERRIT_REFSPEC
-        default: '+refs/heads/tfa_ci_dep_revision:refs/remotes/origin/tfa_ci_dep_revision'
-        description: |
-          tf-m-tests refspec to use. The tfa_ci_dep_revision branch is used by default.
-    - string:
-        name: TF_M_EXTRAS_GERRIT_REFSPEC
-        default: '+refs/heads/tfa_ci_dep_revision:refs/remotes/origin/tfa_ci_dep_revision'
-        description: |
-          tf-m-extras refspec to use. The tfa_ci_dep_revision branch is used by default.
-    - string:
-       name: SPM_REFSPEC
-       default: '+refs/heads/master:refs/remotes/origin/master'
-       description: |
-         SPM(Hafnium) refspec to use. The master branch is used by default.
-    - string:
-        name: CI_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-a-ci-scripts refspec to use. The master branch is used by default.
-    - string:
-        name: RMM_REFSPEC
-        default: '+refs/heads/main:refs/remotes/origin/main'
-        description: |
-          tf-rmm refspec to use. The main branch is used by default.
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
-          tf-a-job-configs refspec to use. The master branch is used by default.
-    - bool:
-        name: ENABLE_STATIC_CHECK
-        default: false
-    - string:
-        name: QA_TOOLS_REPO
-        default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-    - string:
-        name: QA_TOOLS_BRANCH
-        default: 'master'
-    - string:
-        name: USE_TUXSUITE_FVP
-        default: 1
-        description: |
-          Whether to submit FVP tests via TuxSuite (instead of LAVA)
-    - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TEST_GROUPS
+          default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
+          description: |
+            White space separated list of test configs: can be mix of specific
+            test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
+            group names (e.g., <code>l1 l2</code>).
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            trusted-firmware-a refspec to use. The master branch is used by default.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-a-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_TESTS_GERRIT_REFSPEC
+          default: +refs/heads/tfa_ci_dep_revision:refs/remotes/origin/tfa_ci_dep_revision
+          description: |
+            tf-m-tests refspec to use. The tfa_ci_dep_revision branch is used by default.
+      - string:
+          name: TF_M_EXTRAS_GERRIT_REFSPEC
+          default: +refs/heads/tfa_ci_dep_revision:refs/remotes/origin/tfa_ci_dep_revision
+          description: |
+            tf-m-extras refspec to use. The tfa_ci_dep_revision branch is used by default.
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-a-ci-scripts refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - bool:
+          name: ENABLE_STATIC_CHECK
+          default: false
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        CI_ROOT=${PWD}/tf-a-ci-scripts
-        export workspace=$PWD
-        export test_groups=$TEST_GROUPS
-        $CI_ROOT/script/gen_test_desc.py
-        cat << EOF > share.param
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - trigger-builds:
-      - project:
-        - tf-a-builder
-        block: true
-        property-file: share.param
-        current-parameters: true
-        property-file-fail-on-missing: false
-        parameter-factories:
-        - factory: filebuild
-          file-pattern: '*.testprop'
-          no-files-found-action: FAIL
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          CI_ROOT=${PWD}/tf-a-ci-scripts
+          export workspace=$PWD
+          export test_groups=$TEST_GROUPS
+          $CI_ROOT/script/gen_test_desc.py
+          cat << EOF > share.param
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - trigger-builds:
+          - project:
+              - tf-a-builder
+            block: true
+            property-file: share.param
+            current-parameters: true
+            property-file-fail-on-missing: false
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: '*.testprop'
+                no-files-found-action: FAIL
     publishers:
-        - postbuildscript:
-            builders:
-                - role: SLAVE
-                  build-on:
-                      - SUCCESS
-                      - FAILURE
-                      - UNSTABLE
-                      - ABORTED
-                      - NOT_BUILT
-                  build-steps:
-                      - shell: |-
-                          #!/bin/bash -e
-                          export CI_ROOT=${PWD}/tf-a-ci-scripts
-                          bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
-        - archive:
-            artifacts: report.json, report.html, merge/outdir/**
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-ci-gateway/postbuild.groovy
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - UNSTABLE
+                - ABORTED
+                - NOT_BUILT
+              build-steps:
+                - shell: |-
+                    #!/bin/bash -e
+                    export CI_ROOT=${PWD}/tf-a-ci-scripts
+                    bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
+      - archive:
+          artifacts: report.json, report.html, merge/outdir/**
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-ci-gateway/postbuild.groovy
diff --git a/tf-a-cleanup-tfa-next.yaml b/tf-a-cleanup-tfa-next.yaml
index a840af4..f0db5ce 100644
--- a/tf-a-cleanup-tfa-next.yaml
+++ b/tf-a-cleanup-tfa-next.yaml
@@ -7,39 +7,39 @@
     project-type: freestyle
     sandbox: true
     properties:
-    - build-discarder:
-        days-to-keep: 90
-        num-to-keep: 15
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: 15
     triggers:
-    - timed: "0 11 * * 5" # Triggered every Friday at 11 am (GMT)
+      - timed: 0 11 * * 5 # Triggered every Friday at 11 am (GMT)
     builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-            if ! type aws
-            then
-                sudo apt-get -y -qq update
-                sudo apt-get -y -qq install --no-install-recommends unzip
-                curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-                unzip -q awscliv2.zip
-                sudo ./aws/install
-            fi
+      - shell: |
+          #!/bin/bash
+          set -ex
+          if ! type aws
+          then
+              sudo apt-get -y -qq update
+              sudo apt-get -y -qq install --no-install-recommends unzip
+              curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+              unzip -q awscliv2.zip
+              sudo ./aws/install
+          fi
 
-            # All tfa-next related files should be under "artifacts" on the S3 bucket.
-            ROOT=s3://${TUXPUB_S3_BUCKET}/
-            for OBJECT in $(aws s3 ls $ROOT --recursive | grep artifacts | awk '{print $4}');
-            do
-                echo "Current object: ${ROOT}${OBJECT}"
-                # Expected URL format: tf-a/next/artifacts/YYYY-MM-DD-HHMMSS/<bin_mode>/<file_name>
-                # Take the YYYY-MM-DD information from the URL for each object
-                dir_date=$(echo $OBJECT | sed 's+tf-a/next/artifacts/++' | sed 's+/.*++' | grep -E "(([0-9]+-){3,}[0-9]+)" | sed -E 's/-[0-9]+$//')
-                if [ $dir_date ]; then
-                    # Calculate how old the file is (in days)
-                    diff_in_days=$(( ( $(date +%s) - $(date -d "$dir_date" +%s) ) / $((60*60*24)) ))
-                    # Remove the file if it's older than 3 days.
-                    if (( diff_in_days > 3 )); then
-                        echo "Removing object: ${ROOT}${OBJECT}"
-                        aws s3 rm ${ROOT}${OBJECT}
-                    fi
-                fi
-            done
+          # All tfa-next related files should be under "artifacts" on the S3 bucket.
+          ROOT=s3://${TUXPUB_S3_BUCKET}/
+          for OBJECT in $(aws s3 ls $ROOT --recursive | grep artifacts | awk '{print $4}');
+          do
+              echo "Current object: ${ROOT}${OBJECT}"
+              # Expected URL format: tf-a/next/artifacts/YYYY-MM-DD-HHMMSS/<bin_mode>/<file_name>
+              # Take the YYYY-MM-DD information from the URL for each object
+              dir_date=$(echo $OBJECT | sed 's+tf-a/next/artifacts/++' | sed 's+/.*++' | grep -E "(([0-9]+-){3,}[0-9]+)" | sed -E 's/-[0-9]+$//')
+              if [ $dir_date ]; then
+                  # Calculate how old the file is (in days)
+                  diff_in_days=$(( ( $(date +%s) - $(date -d "$dir_date" +%s) ) / $((60*60*24)) ))
+                  # Remove the file if it's older than 3 days.
+                  if (( diff_in_days > 3 )); then
+                      echo "Removing object: ${ROOT}${OBJECT}"
+                      aws s3 rm ${ROOT}${OBJECT}
+                  fi
+              fi
+          done
diff --git a/tf-a-commitlint-tfa-next.yaml b/tf-a-commitlint-tfa-next.yaml
index a94dd40..9fd92ee 100644
--- a/tf-a-commitlint-tfa-next.yaml
+++ b/tf-a-commitlint-tfa-next.yaml
@@ -1,11 +1,9 @@
 - job:
     name: tf-a-commitlint-tfa-next
     description: Lint commit messages
-
     project-type: pipeline
     sandbox: true
     dsl: !include-raw: tf-a-static-tfa-next/Jenkinsfile
-
     properties:
       - build-discarder:
           days-to-keep: 14
diff --git a/tf-a-commitlint.yaml b/tf-a-commitlint.yaml
index 7748039..af53f1a 100644
--- a/tf-a-commitlint.yaml
+++ b/tf-a-commitlint.yaml
@@ -1,11 +1,9 @@
 - job:
     name: tf-a-commitlint
     description: Lint commit messages.
-
     project-type: pipeline
     sandbox: true
     dsl: !include-raw: tf-a-commitlint/Jenkinsfile
-
     properties:
       - build-discarder:
           days-to-keep: 14
diff --git a/tf-a-coverity.yaml b/tf-a-coverity.yaml
index 5ceb475..9034756 100644
--- a/tf-a-coverity.yaml
+++ b/tf-a-coverity.yaml
@@ -11,70 +11,69 @@
       <br/>
       This job runs <b>every weekday</b> and by default uses the <b>integration</b> branch on trustedfirmware.org.
     properties:
-        - build-discarder:
-            days-to-keep: 14
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-                tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: COVERITY_VERSION
-            default: '2024.6.1'
-        - bool:
-            name: UPLOAD_TO_COVERITY_SCAN_ONLINE
-            default: true
-            description: |-
-              Whether the resulting tarball should be automatically uploaded to Coverity Scan Online.
-              <p>
-              <b style="color:red;">The number of uploads allowed on Coverity Scan Online is LIMITED.
-              Therefore, if you don't need the results to be analysed, please UNTICK this box!<b>
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: COVERITY_VERSION
+          default: 2024.6.1
+      - bool:
+          name: UPLOAD_TO_COVERITY_SCAN_ONLINE
+          default: true
+          description: |-
+            Whether the resulting tarball should be automatically uploaded to Coverity Scan Online.
+            <p>
+            <b style="color:red;">The number of uploads allowed on Coverity Scan Online is LIMITED.
+            Therefore, if you don't need the results to be analysed, please UNTICK this box!<b>
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
-        - credentials-binding:
+      - timestamps
+      - credentials-binding:
           - text:
               credential-id: TF-COVERITY-SCAN-TOKEN
               variable: TF_COVERITY_SCAN_TOKEN
     builders:
-        - shell:
-            !include-raw: scripts/clone.sh
-        - shell: |
-            #!/bin/bash
-            set -e
-            set -x
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          set -x
 
-            # Fetch coverity tool and untar it
-            cd ${WORKSPACE}
-            wget ${DOWNLOAD_SERVER_URL}/tf-a/tf-a-coverity/coverity_tool.tgz
-            tar -xzf coverity_tool.tgz
-            mv cov-analysis-linux64-${COVERITY_VERSION} coverity
-            export PATH=${WORKSPACE}/coverity/bin:${PATH}
+          # Fetch coverity tool and untar it
+          cd ${WORKSPACE}
+          wget ${DOWNLOAD_SERVER_URL}/tf-a/tf-a-coverity/coverity_tool.tgz
+          tar -xzf coverity_tool.tgz
+          mv cov-analysis-linux64-${COVERITY_VERSION} coverity
+          export PATH=${WORKSPACE}/coverity/bin:${PATH}
 
-            # Run coverity
-            cd ${WORKSPACE}/trusted-firmware-a
-            ${WORKSPACE}/tf-a-ci-scripts/script/tf-coverity/run_coverity_on_tf.py --tf $(pwd)
-        - conditional-step:
-            condition-kind: boolean-expression
-            condition-expression: "${UPLOAD_TO_COVERITY_SCAN_ONLINE}"
-            on-evaluation-failure: dont-run
-            steps:
+          # Run coverity
+          cd ${WORKSPACE}/trusted-firmware-a
+          ${WORKSPACE}/tf-a-ci-scripts/script/tf-coverity/run_coverity_on_tf.py --tf $(pwd)
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: ${UPLOAD_TO_COVERITY_SCAN_ONLINE}
+          on-evaluation-failure: dont-run
+          steps:
             - shell: |
                 #!/bin/bash
                 set -e
@@ -91,9 +90,8 @@
                   --form description="Build ${BUILD_DISPLAY_NAME}" \
                   https://scan.coverity.com/builds?project=ARM-software%2Farm-trusted-firmware
     publishers:
-        - archive:
-            artifacts: 'trusted-firmware-a/arm-tf-coverity-results.tgz, trusted-firmware-a/tf_coverage.log'
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-coverity/postbuild.groovy
+      - archive:
+          artifacts: trusted-firmware-a/arm-tf-coverity-results.tgz, trusted-firmware-a/tf_coverage.log
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-coverity/postbuild.groovy
diff --git a/tf-a-daily.yaml b/tf-a-daily.yaml
index 1829e1a..0737275 100644
--- a/tf-a-daily.yaml
+++ b/tf-a-daily.yaml
@@ -6,82 +6,81 @@
     disabled: false
     description: Triggers tf-a-windows-builder, tf-main and tf-coverity for the TF-A project.
     properties:
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     parameters:
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: SPM_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-            description: |
-                SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-            name: RMM_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-                tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-                tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_PRIORITY
-            default: 'low'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_PRIORITY
+          default: low
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
+      - timestamps
     builders:
-        - shell:
-            !include-raw: scripts/clone.sh
-        - shell: |
-            #!/bin/bash
-            set -e
-            cat << EOF > share.param
-            SHARE_FOLDER=${SHARE_FOLDER}
-            EOF
-        - trigger-builds:
-            - project:
-                - tf-a-main
-              block: true
-              current-parameters: true
-              property-file: share.param
-            - project:
-                - tf-a-coverity
-              block: true
-              current-parameters: true
-              property-file: share.param
-            - project:
-                - tf-a-windows-builder
-              block: true
-              current-parameters: true
-              property-file: share.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > share.param
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - trigger-builds:
+          - project:
+              - tf-a-main
+            block: true
+            current-parameters: true
+            property-file: share.param
+          - project:
+              - tf-a-coverity
+            block: true
+            current-parameters: true
+            property-file: share.param
+          - project:
+              - tf-a-windows-builder
+            block: true
+            current-parameters: true
+            property-file: share.param
     triggers:
-        - timed: 'H 22 * * *'
+      - timed: H 22 * * *
diff --git a/tf-a-docs-watcher.yaml b/tf-a-docs-watcher.yaml
index b0c492b..93bacb7 100644
--- a/tf-a-docs-watcher.yaml
+++ b/tf-a-docs-watcher.yaml
@@ -3,47 +3,44 @@
     node: docker-amd64-tf-a-jammy
     project-type: freestyle
     concurrent: false
-    description:
-      Triggers whenever a code change is merged into the master branch of the
-      TF-A repository. Executes a webhook to trigger the ReadTheDocs service to
-      build a fresh copy of the documentation for one or more branches.
+    description: Triggers whenever a code change is merged into the master branch of the TF-A repository. Executes a webhook to trigger the ReadTheDocs service to build a fresh copy of the documentation for one or more branches.
     disabled: false
     builders:
-    - shell: |-
-        #!/bin/bash -e
-        echo "Trigger ReadTheDocs build on the $RTD_BRANCHES branch and the latest version"
-        RTD_API="https://readthedocs.org/api/v3/projects/trustedfirmware-a"
-        echo "Trigger build $RTD_BRANCHES branch"
-        curl -s -X POST -H "Authorization: Token ${RTD_TOKEN}" ${RTD_API}/versions/$RTD_BRANCHES/builds/ | jq .
-        echo "Trigger build latest version"
-        curl -s -X POST -H "Authorization: Token ${RTD_TOKEN}" ${RTD_API}/versions/latest/builds/ | jq .
+      - shell: |-
+          #!/bin/bash -e
+          echo "Trigger ReadTheDocs build on the $RTD_BRANCHES branch and the latest version"
+          RTD_API="https://readthedocs.org/api/v3/projects/trustedfirmware-a"
+          echo "Trigger build $RTD_BRANCHES branch"
+          curl -s -X POST -H "Authorization: Token ${RTD_TOKEN}" ${RTD_API}/versions/$RTD_BRANCHES/builds/ | jq .
+          echo "Trigger build latest version"
+          curl -s -X POST -H "Authorization: Token ${RTD_TOKEN}" ${RTD_API}/versions/latest/builds/ | jq .
     properties:
-    - build-discarder:
-        days-to-keep: 60
-        num-to-keep: 10
+      - build-discarder:
+          days-to-keep: 60
+          num-to-keep: 10
     triggers:
-    - gerrit:
-        silent: true
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'master'
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        trigger-on:
-        - ref-updated-event
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: master
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+          trigger-on:
+            - ref-updated-event
     wrappers:
-    - timestamps
-    - credentials-binding:
-      - text:
-          credential-id: TF-A-RTD-API-TOKEN
-          variable: RTD_TOKEN
+      - timestamps
+      - credentials-binding:
+          - text:
+              credential-id: TF-A-RTD-API-TOKEN
+              variable: RTD_TOKEN
     parameters:
-    - string:
-        name: RTD_BRANCHES
-        default: master
-        description: |
-          The branch, or branches, to rebuild the documentation for.
+      - string:
+          name: RTD_BRANCHES
+          default: master
+          description: |
+            The branch, or branches, to rebuild the documentation for.
     publishers:
-    - workspace-cleanup
+      - workspace-cleanup
diff --git a/tf-a-eclair-daily-separate.yaml b/tf-a-eclair-daily-separate.yaml
index 5a4b552..5b423f2 100644
--- a/tf-a-eclair-daily-separate.yaml
+++ b/tf-a-eclair-daily-separate.yaml
@@ -7,141 +7,142 @@
     description: |
       ECLAIR (MISRA compliance) testing of TF-A (different configs built independently/separately)
     properties:
-        - build-discarder:
-            days-to-keep: 40
-        - throttle:
-            option: category
-            categories: [eclair-daily]
-            matrix-builds: false
-            matrix-configs: true
+      - build-discarder:
+          days-to-keep: 40
+      - throttle:
+          option: category
+          categories:
+            - eclair-daily
+          matrix-builds: false
+          matrix-configs: true
     parameters:
-        - string:
-            name: MAKE_TARGET
-            default: ''
-            description: |
-              TF-A make target
-        - string:
-            name: DEBUG
-            default: '1'
-            description: |
-              TF-A make DEBUG setting
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-            description: |
-              Git project to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_REFNAME
-            default: 'integration'
-            description: |
-              Git branch to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_NEWREV
-            default: ''
-            description: |
-              Git revision to build (also set by Gerrit ref-updated trigger)
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.28.0.tar.gz'
-            description: |
-              URL of mbedTLS library to use in build (only for some configurations)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: MAKE_TARGET
+          default: ""
+          description: |
+            TF-A make target
+      - string:
+          name: DEBUG
+          default: "1"
+          description: |
+            TF-A make DEBUG setting
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+          description: |
+            Git project to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_REFNAME
+          default: integration
+          description: |
+            Git branch to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_NEWREV
+          default: ""
+          description: |
+            Git revision to build (also set by Gerrit ref-updated trigger)
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.28.0.tar.gz
+          description: |
+            URL of mbedTLS library to use in build (only for some configurations)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-tf-a-eclair
-        - axis:
-            type: user-defined
-            name: TF_CONFIG
-            values:
-                - fvp-aarch32-default
-                - fvp-aarch32-enable-runtime-instr
-                - fvp-aarch32-rst-to-sp-min
-                - fvp-boot-el3-payload
-                - fvp-default
-                - fvp-enable-runtime-instr
-                - fvp-ext-pstate-ea-el3
-                # Causes runtime error in ECLAIR: https://support.bugseng.com/mantis/view.php?id=5083
-                #- fvp-mb_hash256-tbb_hash256-romlib
-                - fvp-no-cohmem
-                - fvp-opteed
-                - fvp-r-default
-                - fvp-rst-bl31
-                - fvp-tspd
-                - fvp-tspd-gicv2-symmetric-model
-                - fvp-tspd-irq2el3
-                - fvp-tspd-quad-cluster
-                - fvp-tspd-tbb-mbedtls
-                - fvp-tspd-tsp-async
-                - juno-aarch32-rst-to-sp-min
-                - juno-aarch32-rst-to-sp-min-enable-runtime-instr
-                - juno-default
-                - juno-tspd
+      - axis:
+          type: slave
+          name: label
+          values:
+            - docker-tf-a-eclair
+      - axis:
+          type: user-defined
+          name: TF_CONFIG
+          values:
+            - fvp-aarch32-default
+            - fvp-aarch32-enable-runtime-instr
+            - fvp-aarch32-rst-to-sp-min
+            - fvp-boot-el3-payload
+            - fvp-default
+            - fvp-enable-runtime-instr
+            - fvp-ext-pstate-ea-el3
+            # Causes runtime error in ECLAIR: https://support.bugseng.com/mantis/view.php?id=5083
+            #- fvp-mb_hash256-tbb_hash256-romlib
+            - fvp-no-cohmem
+            - fvp-opteed
+            - fvp-r-default
+            - fvp-rst-bl31
+            - fvp-tspd
+            - fvp-tspd-gicv2-symmetric-model
+            - fvp-tspd-irq2el3
+            - fvp-tspd-quad-cluster
+            - fvp-tspd-tbb-mbedtls
+            - fvp-tspd-tsp-async
+            - juno-aarch32-rst-to-sp-min
+            - juno-aarch32-rst-to-sp-min-enable-runtime-instr
+            - juno-default
+            - juno-tspd
     triggers:
-    - timed: 'H 2 * * 0'
-#    - gerrit:
-#        silent: true
-#        server-name: 'review.trustedfirmware.org'
-#        projects:
-#        - branches:
-#          - branch-compare-type: PLAIN
-#            branch-pattern: integration
-#          project-compare-type: PLAIN
-#          project-pattern: 'TF-A/trusted-firmware-a'
-#        trigger-on:
-#        - ref-updated-event
+      - timed: H 2 * * 0
+        #    - gerrit:
+        #        silent: true
+        #        server-name: 'review.trustedfirmware.org'
+        #        projects:
+        #        - branches:
+        #          - branch-compare-type: PLAIN
+        #            branch-pattern: integration
+        #          project-compare-type: PLAIN
+        #          project-pattern: 'TF-A/trusted-firmware-a'
+        #        trigger-on:
+        #        - ref-updated-event
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 120
-            fail: true
+      - timestamps
+      - timeout:
+          timeout: 120
+          fail: true
     builders:
-    - shell: |
-        #!/bin/bash
-        set -ex
-        pwd
-        git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-        git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
+      - shell: |
+          #!/bin/bash
+          set -ex
+          pwd
+          git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
 
-        git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_REFNAME}
-        ls -l
-        if [ -n "${GERRIT_NEWREV}" ]; then
-            (cd $(basename ${GERRIT_PROJECT}); git checkout ${GERRIT_NEWREV})
-        else
-            # Checkout last commit from yesterday, to have a stable commit for
-            # multiple builds.
-            (cd $(basename ${GERRIT_PROJECT}); git checkout $(git rev-list -n1 --before="today" HEAD))
-        fi
-        (cd $(basename ${GERRIT_PROJECT}); git log -n1)
+          git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_REFNAME}
+          ls -l
+          if [ -n "${GERRIT_NEWREV}" ]; then
+              (cd $(basename ${GERRIT_PROJECT}); git checkout ${GERRIT_NEWREV})
+          else
+              # Checkout last commit from yesterday, to have a stable commit for
+              # multiple builds.
+              (cd $(basename ${GERRIT_PROJECT}); git checkout $(git rev-list -n1 --before="today" HEAD))
+          fi
+          (cd $(basename ${GERRIT_PROJECT}); git log -n1)
 
-        export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
-        . tf-ci-scripts/eclair/utils.sh
-        # TODO
-        #. tf-a-ci-scripts/eclair/utils_tfa.sh
+          export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
+          . tf-ci-scripts/eclair/utils.sh
+          # TODO
+          #. tf-a-ci-scripts/eclair/utils_tfa.sh
 
-        detachLicense 5400
-        trap "returnLicense" EXIT
+          detachLicense 5400
+          trap "returnLicense" EXIT
 
-        . tf-a-ci-scripts/eclair/analyze_common.sh
-        export ECLAIR_ANALYSIS=ECLAIR
-        eclair_prepare
-        eclair_analyze tf-a-ci-scripts/eclair/build-tfa.sh ${TF_CONFIG}
-        eclair_make_ecd
-        eclair_make_reports
-        eclair_compress_db
+          . tf-a-ci-scripts/eclair/analyze_common.sh
+          export ECLAIR_ANALYSIS=ECLAIR
+          eclair_prepare
+          eclair_analyze tf-a-ci-scripts/eclair/build-tfa.sh ${TF_CONFIG}
+          eclair_make_ecd
+          eclair_make_reports
+          eclair_compress_db
 
-        tf-ci-scripts/eclair/analyze_index_html.sh
+          tf-ci-scripts/eclair/analyze_index_html.sh
     publishers:
-        - archive:
-            artifacts: 'ECLAIR/**, index.html'
-            excludes: 'ECLAIR/out/.data/**'
-            latest-only: false
-            allow-empty: true
+      - archive:
+          artifacts: ECLAIR/**, index.html
+          excludes: ECLAIR/out/.data/**
+          latest-only: false
+          allow-empty: true
diff --git a/tf-a-eclair-daily.yaml b/tf-a-eclair-daily.yaml
index 60d0920..74d1d9a 100644
--- a/tf-a-eclair-daily.yaml
+++ b/tf-a-eclair-daily.yaml
@@ -8,136 +8,116 @@
     description: |
       ECLAIR (MISRA compliance) testing of TF-A
     properties:
-        - build-discarder:
-            days-to-keep: 40
+      - build-discarder:
+          days-to-keep: 40
     parameters:
-        - string:
-            name: TF_CONFIG_LIST
-            default: >
-              fvp-aarch32-default
-              fvp-aarch32-enable-runtime-instr
-              fvp-aarch32-rst-to-sp-min
-              fvp-boot-el3-payload
-              fvp-default
-              fvp-enable-runtime-instr
-              fvp-ext-pstate-ea-el3
-              fvp-no-cohmem
-              fvp-opteed
-              fvp-r-default
-              fvp-rst-bl31
-              fvp-tspd
-              fvp-tspd-gicv2-symmetric-model
-              fvp-tspd-irq2el3
-              fvp-tspd-quad-cluster
-              fvp-tspd-tbb-mbedtls
-              fvp-tspd-tsp-async
-              juno-aarch32-rst-to-sp-min
-              juno-aarch32-rst-to-sp-min-enable-runtime-instr
-              juno-default
-              juno-tspd
-            description: |
-              List of TF-A configs to build
-        - string:
-            name: MAKE_TARGET
-            default: ''
-            description: |
-              TF-A make target
-        - string:
-            name: MAKE_JOBS
-            default: '16'
-            description: |
-              --jobs to pass to make, etc.
-        - string:
-            name: DEBUG
-            default: '1'
-            description: |
-              TF-A make DEBUG setting
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-            description: |
-              Git project to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_REFNAME
-            default: 'integration'
-            description: |
-              Git branch to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_NEWREV
-            default: ''
-            description: |
-              Git revision to build (also set by Gerrit ref-updated trigger)
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-            description: |
-              URL of mbedTLS library to use in build (only for some configurations)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TF_CONFIG_LIST
+          default: |
+            fvp-aarch32-default fvp-aarch32-enable-runtime-instr fvp-aarch32-rst-to-sp-min fvp-boot-el3-payload fvp-default fvp-enable-runtime-instr fvp-ext-pstate-ea-el3 fvp-no-cohmem fvp-opteed fvp-r-default fvp-rst-bl31 fvp-tspd fvp-tspd-gicv2-symmetric-model fvp-tspd-irq2el3 fvp-tspd-quad-cluster fvp-tspd-tbb-mbedtls fvp-tspd-tsp-async juno-aarch32-rst-to-sp-min juno-aarch32-rst-to-sp-min-enable-runtime-instr juno-default juno-tspd
+          description: |
+            List of TF-A configs to build
+      - string:
+          name: MAKE_TARGET
+          default: ""
+          description: |
+            TF-A make target
+      - string:
+          name: MAKE_JOBS
+          default: "16"
+          description: |
+            --jobs to pass to make, etc.
+      - string:
+          name: DEBUG
+          default: "1"
+          description: |
+            TF-A make DEBUG setting
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+          description: |
+            Git project to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_REFNAME
+          default: integration
+          description: |
+            Git branch to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_NEWREV
+          default: ""
+          description: |
+            Git revision to build (also set by Gerrit ref-updated trigger)
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+          description: |
+            URL of mbedTLS library to use in build (only for some configurations)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     triggers:
-    - timed : 'H 2 * * *'
-#    - gerrit:
-#        silent: true
-#        server-name: 'review.trustedfirmware.org'
-#        projects:
-#        - branches:
-#          - branch-compare-type: PLAIN
-#            branch-pattern: integration
-#          project-compare-type: PLAIN
-#          project-pattern: 'TF-A/trusted-firmware-a'
-#        trigger-on:
-#        - ref-updated-event
+      - timed: H 2 * * *
+        #    - gerrit:
+        #        silent: true
+        #        server-name: 'review.trustedfirmware.org'
+        #        projects:
+        #        - branches:
+        #          - branch-compare-type: PLAIN
+        #            branch-pattern: integration
+        #          project-compare-type: PLAIN
+        #          project-pattern: 'TF-A/trusted-firmware-a'
+        #        trigger-on:
+        #        - ref-updated-event
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 420
-            fail: true
+      - timestamps
+      - timeout:
+          timeout: 420
+          fail: true
     builders:
-    - shell: |
-        #!/bin/bash
-        set -ex
-        export PATH=~/.local/bin:$PATH
-        pwd
-        git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-        git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
+      - shell: |
+          #!/bin/bash
+          set -ex
+          export PATH=~/.local/bin:$PATH
+          pwd
+          git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
 
-        git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_REFNAME}
-        ls -l
-        if [ -n "${GERRIT_NEWREV}" ]; then
-            (cd $(basename ${GERRIT_PROJECT}); git checkout ${GERRIT_NEWREV})
-        else
-            # Checkout last commit from yesterday, to have a stable commit for
-            # multiple builds.
-            (cd $(basename ${GERRIT_PROJECT}); git checkout $(git rev-list -n1 --before="today" HEAD))
-        fi
-        (cd $(basename ${GERRIT_PROJECT}); git log -n1)
+          git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_REFNAME}
+          ls -l
+          if [ -n "${GERRIT_NEWREV}" ]; then
+              (cd $(basename ${GERRIT_PROJECT}); git checkout ${GERRIT_NEWREV})
+          else
+              # Checkout last commit from yesterday, to have a stable commit for
+              # multiple builds.
+              (cd $(basename ${GERRIT_PROJECT}); git checkout $(git rev-list -n1 --before="today" HEAD))
+          fi
+          (cd $(basename ${GERRIT_PROJECT}); git log -n1)
 
-        export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
-        . tf-ci-scripts/eclair/utils.sh
-        # TODO
-        #. tf-a-ci-scripts/eclair/utils_tfa.sh
+          export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
+          . tf-ci-scripts/eclair/utils.sh
+          # TODO
+          #. tf-a-ci-scripts/eclair/utils_tfa.sh
 
-        . tf-a-ci-scripts/eclair/eclair_vars.sh
+          . tf-a-ci-scripts/eclair/eclair_vars.sh
 
-        detachLicense 600
-        trap "returnLicense || true" EXIT
+          detachLicense 600
+          trap "returnLicense || true" EXIT
 
-        export ECLAIR_ANALYSIS=ECLAIR
-        eclair_prepare
-        eclair_analyze tf-a-ci-scripts/eclair/build-tfa-multiple.sh
-        eclair_make_ecd
-        eclair_make_reports
-        eclair_compress_db
+          export ECLAIR_ANALYSIS=ECLAIR
+          eclair_prepare
+          eclair_analyze tf-a-ci-scripts/eclair/build-tfa-multiple.sh
+          eclair_make_ecd
+          eclair_make_reports
+          eclair_compress_db
 
-        tf-ci-scripts/eclair/analyze_index_html.sh
+          tf-ci-scripts/eclair/analyze_index_html.sh
     publishers:
-        - archive:
-            artifacts: 'ECLAIR/**, index.html'
-            excludes: 'ECLAIR/out/.data/**'
-            latest-only: false
-            allow-empty: true
+      - archive:
+          artifacts: ECLAIR/**, index.html
+          excludes: ECLAIR/out/.data/**
+          latest-only: false
+          allow-empty: true
diff --git a/tf-a-eclair-delta-separate.yaml b/tf-a-eclair-delta-separate.yaml
index 9cd2816..3196832 100644
--- a/tf-a-eclair-delta-separate.yaml
+++ b/tf-a-eclair-delta-separate.yaml
@@ -7,158 +7,159 @@
     description: |
       ECLAIR (MISRA compliance) testing of TF-A patches (different configs built independently/separately)
     properties:
-        - build-discarder:
-            days-to-keep: 45
-            num-to-keep: 200
-            artifact-num-to-keep: 80
-        - throttle:
-            option: category
-            categories: [eclair]
-            matrix-builds: false
-            matrix-configs: true
+      - build-discarder:
+          days-to-keep: 45
+          num-to-keep: 200
+          artifact-num-to-keep: 80
+      - throttle:
+          option: category
+          categories:
+            - eclair
+          matrix-builds: false
+          matrix-configs: true
     parameters:
-        - string:
-            name: MAKE_TARGET
-            default: ''
-            description: |
-              TF-A make target
-        - string:
-            name: DEBUG
-            default: '1'
-            description: |
-              TF-A make DEBUG setting
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-            description: |
-              Git project to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_BRANCH
-            default: 'integration'
-            description: |
-              Git branch to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_REFSPEC
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.4.1.tar.gz'
-            description: |
-              URL of mbedTLS library to use in build (only for some configurations)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: MAKE_TARGET
+          default: ""
+          description: |
+            TF-A make target
+      - string:
+          name: DEBUG
+          default: "1"
+          description: |
+            TF-A make DEBUG setting
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+          description: |
+            Git project to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_BRANCH
+          default: integration
+          description: |
+            Git branch to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_REFSPEC
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.4.1.tar.gz
+          description: |
+            URL of mbedTLS library to use in build (only for some configurations)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-tf-a-eclair
-        - axis:
-            type: user-defined
-            name: TF_CONFIG
-            values:
-                - fvp-default
+      - axis:
+          type: slave
+          name: label
+          values:
+            - docker-tf-a-eclair
+      - axis:
+          type: user-defined
+          name: TF_CONFIG
+          values:
+            - fvp-default
     triggers:
-    - gerrit:
-        silent: true
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: integration
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: integration
-          project-compare-type: PLAIN
-          project-pattern: 'sandbox/pfalcon/trusted-firmware-a'
-        trigger-on:
-        - comment-added-event:
-            approval-category: "Allow-CI"
-            approval-value: 1
-        - comment-added-event:
-            approval-category: "Allow-CI"
-            approval-value: 2
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: integration
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: integration
+              project-compare-type: PLAIN
+              project-pattern: sandbox/pfalcon/trusted-firmware-a
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
     wrappers:
-    - timestamps
-    - timeout:
-        timeout: 150
-        fail: true
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
+      - timestamps
+      - timeout:
+          timeout: 150
+          fail: true
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
     builders:
-    - shell: |
-        #!/bin/bash
-        set -ex
-        pwd
-        env | grep GERRIT
-        git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-        git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
+      - shell: |
+          #!/bin/bash
+          set -ex
+          pwd
+          env | grep GERRIT
+          git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
 
-        git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_BRANCH}
-        if [ -n "${GERRIT_REFSPEC}" ]; then
-        (
-            cd $(basename ${GERRIT_PROJECT})
-            git fetch https://${GERRIT_HOST}/${GERRIT_PROJECT} ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
-        )
-        fi
-        (cd trusted-firmware-a; git log --oneline -n5)
+          git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_BRANCH}
+          if [ -n "${GERRIT_REFSPEC}" ]; then
+          (
+              cd $(basename ${GERRIT_PROJECT})
+              git fetch https://${GERRIT_HOST}/${GERRIT_PROJECT} ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
+          )
+          fi
+          (cd trusted-firmware-a; git log --oneline -n5)
 
-        export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
-        . tf-ci-scripts/eclair/utils.sh
-        # TODO
-        #. tf-a-ci-scripts/eclair/utils_tfa.sh
+          export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
+          . tf-ci-scripts/eclair/utils.sh
+          # TODO
+          #. tf-a-ci-scripts/eclair/utils_tfa.sh
 
-        detachLicense 9000
-        trap "returnLicense || true" EXIT
+          detachLicense 9000
+          trap "returnLicense || true" EXIT
 
-        . tf-a-ci-scripts/eclair/analyze_common.sh
+          . tf-a-ci-scripts/eclair/analyze_common.sh
 
-        export ECLAIR_ANALYSIS=ECLAIR
-        eclair_prepare
-        eclair_analyze tf-a-ci-scripts/eclair/build-tfa.sh ${TF_CONFIG}
-        eclair_make_ecd
-        eclair_make_reports
+          export ECLAIR_ANALYSIS=ECLAIR
+          eclair_prepare
+          eclair_analyze tf-a-ci-scripts/eclair/build-tfa.sh ${TF_CONFIG}
+          eclair_make_ecd
+          eclair_make_reports
 
-        echo "========= Building base revision ========="
+          echo "========= Building base revision ========="
 
-        (
-            cd $(basename ${GERRIT_PROJECT})
-            git checkout HEAD^
-            git log --oneline -n5
-        )
+          (
+              cd $(basename ${GERRIT_PROJECT})
+              git checkout HEAD^
+              git log --oneline -n5
+          )
 
-        export ECLAIR_ANALYSIS=ECLAIR_BASE
-        eclair_prepare
-        eclair_analyze tf-a-ci-scripts/eclair/build-tfa.sh ${TF_CONFIG}
-        eclair_make_ecd
-        eclair_make_reports
+          export ECLAIR_ANALYSIS=ECLAIR_BASE
+          eclair_prepare
+          eclair_analyze tf-a-ci-scripts/eclair/build-tfa.sh ${TF_CONFIG}
+          eclair_make_ecd
+          eclair_make_reports
 
-        eclair_make_delta_report ECLAIR_BASE ECLAIR
-        tf-ci-scripts/eclair/eclair_diff_report.py diff_output > misra_delta.txt
+          eclair_make_delta_report ECLAIR_BASE ECLAIR
+          tf-ci-scripts/eclair/eclair_diff_report.py diff_output > misra_delta.txt
 
-        returnLicense
-        tf-ci-scripts/eclair/analyze_delta_index_html.sh
-        tf-ci-scripts/eclair/post_gerrit_comment.sh
+          returnLicense
+          tf-ci-scripts/eclair/analyze_delta_index_html.sh
+          tf-ci-scripts/eclair/post_gerrit_comment.sh
     publishers:
-        - archive:
-            artifacts: 'ECLAIR*/**, diff_output/**, misra_delta.txt, *issues_html/**, index.html'
-            excludes: 'ECLAIR/out/.data/**'
-            latest-only: false
-            allow-empty: true
+      - archive:
+          artifacts: ECLAIR*/**, diff_output/**, misra_delta.txt, *issues_html/**, index.html
+          excludes: ECLAIR/out/.data/**
+          latest-only: false
+          allow-empty: true
diff --git a/tf-a-eclair-delta.yaml b/tf-a-eclair-delta.yaml
index 9fa78e6..c1e2351 100644
--- a/tf-a-eclair-delta.yaml
+++ b/tf-a-eclair-delta.yaml
@@ -8,155 +8,152 @@
     description: |
       ECLAIR (MISRA compliance) testing of TF-A patches
     properties:
-        - build-discarder:
-            days-to-keep: 45
-            num-to-keep: 200
-            artifact-num-to-keep: 80
+      - build-discarder:
+          days-to-keep: 45
+          num-to-keep: 200
+          artifact-num-to-keep: 80
     parameters:
-        - string:
-            name: TF_CONFIG_LIST
-            default: >
-              fvp-tbb-mbedtls-rme-romlib
-              fvp-spm-spmd-lsp
-              fvp-pauth-bti-sdei
-              fvp-aarch32-roxlattables
-        - string:
-            name: MAKE_TARGET
-            default: ''
-            description: |
-              TF-A make target
-        - string:
-            name: MAKE_JOBS
-            default: '16'
-            description: |
-              --jobs to pass to make, etc.
-        - string:
-            name: DEBUG
-            default: '1'
-            description: |
-              TF-A make DEBUG setting
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-            description: |
-              Git project to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_BRANCH
-            default: 'integration'
-            description: |
-              Git branch to build (also set by Gerrit trigger)
-        - string:
-            name: GERRIT_REFSPEC
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-            description: |
-              URL of mbedTLS library to use in build (only for some configurations)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TF_CONFIG_LIST
+          default: |
+            fvp-tbb-mbedtls-rme-romlib fvp-spm-spmd-lsp fvp-pauth-bti-sdei fvp-aarch32-roxlattables
+      - string:
+          name: MAKE_TARGET
+          default: ""
+          description: |
+            TF-A make target
+      - string:
+          name: MAKE_JOBS
+          default: "16"
+          description: |
+            --jobs to pass to make, etc.
+      - string:
+          name: DEBUG
+          default: "1"
+          description: |
+            TF-A make DEBUG setting
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+          description: |
+            Git project to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_BRANCH
+          default: integration
+          description: |
+            Git branch to build (also set by Gerrit trigger)
+      - string:
+          name: GERRIT_REFSPEC
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+          description: |
+            URL of mbedTLS library to use in build (only for some configurations)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     triggers:
-    - gerrit:
-        silent: true
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: integration
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: integration
-          project-compare-type: PLAIN
-          project-pattern: 'sandbox/pfalcon/trusted-firmware-a'
-        trigger-on:
-        - comment-added-event:
-            approval-category: "Allow-CI"
-            approval-value: 1
-        - comment-added-event:
-            approval-category: "Allow-CI"
-            approval-value: 2
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: integration
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: integration
+              project-compare-type: PLAIN
+              project-pattern: sandbox/pfalcon/trusted-firmware-a
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
     wrappers:
-    - timestamps
-    - timeout:
-        timeout: 330
-        fail: true
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
+      - timestamps
+      - timeout:
+          timeout: 330
+          fail: true
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
     builders:
-    - shell: |
-        #!/bin/bash
-        set -ex
-        export PATH=~/.local/bin:$PATH
-        pwd
-        env | grep GERRIT
-        git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-        git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
+      - shell: |
+          #!/bin/bash
+          set -ex
+          export PATH=~/.local/bin:$PATH
+          pwd
+          env | grep GERRIT
+          git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          git clone https://git.trustedfirmware.org/ci/tf-ci-scripts.git
 
-        git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_BRANCH}
-        if [ -n "${GERRIT_REFSPEC}" ]; then
-        (
-            cd $(basename ${GERRIT_PROJECT})
-            git fetch https://${GERRIT_HOST}/${GERRIT_PROJECT} ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
-        )
-        fi
-        (cd trusted-firmware-a; git log --oneline -n5)
+          git clone https://${GERRIT_HOST}/${GERRIT_PROJECT} -b ${GERRIT_BRANCH}
+          if [ -n "${GERRIT_REFSPEC}" ]; then
+          (
+              cd $(basename ${GERRIT_PROJECT})
+              git fetch https://${GERRIT_HOST}/${GERRIT_PROJECT} ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
+          )
+          fi
+          (cd trusted-firmware-a; git log --oneline -n5)
 
-        export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
-        . tf-ci-scripts/eclair/utils.sh
-        # TODO
-        #. tf-a-ci-scripts/eclair/utils_tfa.sh
+          export ECLAIR_CONFIG_DIR=$PWD/tf-a-ci-scripts/eclair
+          . tf-ci-scripts/eclair/utils.sh
+          # TODO
+          #. tf-a-ci-scripts/eclair/utils_tfa.sh
 
-        . tf-a-ci-scripts/eclair/eclair_vars.sh
+          . tf-a-ci-scripts/eclair/eclair_vars.sh
 
-        detachLicense 600
-        trap "returnLicense || true" EXIT
+          detachLicense 600
+          trap "returnLicense || true" EXIT
 
-        export ECLAIR_ANALYSIS=ECLAIR
-        eclair_prepare
-        eclair_analyze tf-a-ci-scripts/eclair/build-tfa-multiple.sh
-        eclair_make_ecd
-        eclair_make_reports
+          export ECLAIR_ANALYSIS=ECLAIR
+          eclair_prepare
+          eclair_analyze tf-a-ci-scripts/eclair/build-tfa-multiple.sh
+          eclair_make_ecd
+          eclair_make_reports
 
-        echo "========= Building base revision ========="
+          echo "========= Building base revision ========="
 
-        (
-            cd $(basename ${GERRIT_PROJECT})
-            git checkout HEAD^
-            git log --oneline -n5
-        )
+          (
+              cd $(basename ${GERRIT_PROJECT})
+              git checkout HEAD^
+              git log --oneline -n5
+          )
 
-        export ECLAIR_ANALYSIS=ECLAIR_BASE
-        eclair_prepare
-        eclair_analyze tf-a-ci-scripts/eclair/build-tfa-multiple.sh
-        eclair_make_ecd
-        eclair_make_reports
+          export ECLAIR_ANALYSIS=ECLAIR_BASE
+          eclair_prepare
+          eclair_analyze tf-a-ci-scripts/eclair/build-tfa-multiple.sh
+          eclair_make_ecd
+          eclair_make_reports
 
-        eclair_make_delta_report ECLAIR_BASE ECLAIR
-        tf-ci-scripts/eclair/eclair_diff_report.py diff_output > misra_delta.txt
+          eclair_make_delta_report ECLAIR_BASE ECLAIR
+          tf-ci-scripts/eclair/eclair_diff_report.py diff_output > misra_delta.txt
 
-        returnLicense
-        tf-ci-scripts/eclair/analyze_delta_index_html.sh
-        tf-ci-scripts/eclair/post_gerrit_comment.sh
+          returnLicense
+          tf-ci-scripts/eclair/analyze_delta_index_html.sh
+          tf-ci-scripts/eclair/post_gerrit_comment.sh
     publishers:
-        - archive:
-            artifacts: 'ECLAIR*/**, diff_output/**, misra_delta.txt, *issues_html/**, index.html'
-            excludes: 'ECLAIR/out/.data/**'
-            latest-only: false
-            allow-empty: true
+      - archive:
+          artifacts: ECLAIR*/**, diff_output/**, misra_delta.txt, *issues_html/**, index.html
+          excludes: ECLAIR/out/.data/**
+          latest-only: false
+          allow-empty: true
diff --git a/tf-a-gerrit-tforg-l1.yaml b/tf-a-gerrit-tforg-l1.yaml
index 721f1fb..297e542 100644
--- a/tf-a-gerrit-tforg-l1.yaml
+++ b/tf-a-gerrit-tforg-l1.yaml
@@ -8,155 +8,154 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 15
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-           name: SPM_REFSPEC
-           default: '+refs/heads/master:refs/remotes/origin/master'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-           name: RMM_REFSPEC
-           default: '+refs/heads/main:refs/remotes/origin/main'
-           description: |
-             tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Lint commit messages
-        condition: COMPLETED
-        projects:
-        - name: tf-a-commitlint
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
-            REFSPEC=${GERRIT_REFSPEC}
-            REFNAME=${GERRIT_PATCHSET_REVISION}
-            REFNAME_BASE=origin/${GERRIT_BRANCH}
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tf-l2-scan-build
-            ENABLE_STATIC_CHECK=true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run build tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Lint commit messages
+          condition: COMPLETED
+          projects:
+            - name: tf-a-commitlint
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
+                REFSPEC=${GERRIT_REFSPEC}
+                REFNAME=${GERRIT_PATCHSET_REVISION}
+                REFNAME_BASE=origin/${GERRIT_BRANCH}
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tf-l2-scan-build
+                ENABLE_STATIC_CHECK=true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run build tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-        - project-compare-type: PLAIN
-          project-pattern: TF-A/trusted-firmware-a
-          branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: integration
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: integration
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-gerrit-tforg-l2.yaml b/tf-a-gerrit-tforg-l2.yaml
index df24f88..967b946 100644
--- a/tf-a-gerrit-tforg-l2.yaml
+++ b/tf-a-gerrit-tforg-l2.yaml
@@ -8,192 +8,190 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 15
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-           name: SPM_REFSPEC
-           default: '+refs/heads/master:refs/remotes/origin/master'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-           name: RMM_REFSPEC
-           default: '+refs/heads/main:refs/remotes/origin/main'
-           description: |
-             tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build Trusted Firmware
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run platform boot tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-boot-tests-arm-plats tf-l2-boot-tests-partner-boards
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: TFTF tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Boot up to the Linux shell prompt
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - conditional-step:
-        condition-command: |-
-          [ "$NOMINATION_FILE" ]
-        condition-kind: shell
-        on-evaluation-failure: dont-run
-        steps:
-        - multijob:
-            condition: COMPLETED
-            name: Nominated tests
-            projects:
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build Trusted Firmware
+          projects:
             - kill-phase-on: NEVER
               name: tf-a-ci-gateway
               current-parameters: true
               predefined-parameters: |
-                TEST_GROUPS=@$NOMINATION_FILE
+                TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
                 TF_REFSPEC=$GERRIT_REFSPEC
               property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run platform boot tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              predefined-parameters: |
+                TEST_GROUPS=tf-l2-boot-tests-arm-plats tf-l2-boot-tests-partner-boards
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: TFTF tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Boot up to the Linux shell prompt
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - conditional-step:
+          condition-command: '[ "$NOMINATION_FILE" ]'
+          condition-kind: shell
+          on-evaluation-failure: dont-run
+          steps:
+            - multijob:
+                condition: COMPLETED
+                name: Nominated tests
+                projects:
+                  - kill-phase-on: NEVER
+                    name: tf-a-ci-gateway
+                    current-parameters: true
+                    predefined-parameters: |
+                      TEST_GROUPS=@$NOMINATION_FILE
+                      TF_REFSPEC=$GERRIT_REFSPEC
+                    property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/trusted-firmware-a
-            branches:
-              - branch-compare-type: PLAIN
-                branch-pattern: integration
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        failure-message: 'OpenCI: build failed'
-        successful-message: 'OpenCI: build successful'
-        unstable-message: 'OpenCI: build unstable'
-        notbuilt-message: 'OpenCI: no builds executed'
-        silent: false
-        silent-start: false
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: integration
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          failure-message: 'OpenCI: build failed'
+          successful-message: 'OpenCI: build successful'
+          unstable-message: 'OpenCI: build unstable'
+          notbuilt-message: 'OpenCI: no builds executed'
+          silent: false
+          silent-start: false
diff --git a/tf-a-lts-automation.yaml b/tf-a-lts-automation.yaml
index 1628ffb..4172344 100644
--- a/tf-a-lts-automation.yaml
+++ b/tf-a-lts-automation.yaml
@@ -9,99 +9,97 @@
       It helps to create corrosponding branch in the tf-a-test, hafnium, and tf-a-ci-scripts repositories, as well as set up a new download
       space for the new LTS branch.
     properties:
-        - build-discarder:
-            days-to-keep: 15
+      - build-discarder:
+          days-to-keep: 15
     parameters:
-        - string:
-            name: EMAIL_RECIPIENT
-            default: |
-              bipin.ravi@arm.com, vwadekar@nvidia.com, yann.gautier@st.com, jidong@google.com, govindraj.raja@arm.com, arthur.she@linaro.org
-            description: |
-              The notification recipients
+      - string:
+          name: EMAIL_RECIPIENT
+          default: |
+            bipin.ravi@arm.com, vwadekar@nvidia.com, yann.gautier@st.com, jidong@google.com, govindraj.raja@arm.com, arthur.she@linaro.org
+          description: |
+            The notification recipients
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 120
-            fail: true
-        - credentials-binding:
-            - ssh-user-private-key:
-                credential-id: TFA_CI_BOT_USER_SSH_KEY
-                key-file-variable: CI_BOT_KEY
-                username-variable: CI_BOT_USERNAME
-                passphrase-variable: ''
+      - timestamps
+      - timeout:
+          timeout: 120
+          fail: true
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
     triggers:
-        - gerrit:
-            silent: true
-            server-name: 'review.trustedfirmware.org'
-            projects:
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
             - branches:
                 - branch-compare-type: REG_EXP
-                  branch-pattern: 'lts-v.*'
+                  branch-pattern: lts-v.*
               project-compare-type: PLAIN
-              project-pattern: 'TF-A/trusted-firmware-a'
-            trigger-on:
+              project-pattern: TF-A/trusted-firmware-a
+          trigger-on:
             - ref-updated-event
-
     builders:
-        - shell: |
-            echo "***************************************"
-            env | grep GERRIT
-            echo "***************************************"
-        - shell: |
-            #!/bin/bash
-            set -ex
+      - shell: |
+          echo "***************************************"
+          env | grep GERRIT
+          echo "***************************************"
+      - shell: |
+          #!/bin/bash
+          set -ex
 
-            SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa"
-            export GIT_SSH_COMMAND="ssh -p 29418 -i $CI_BOT_KEY ${SSH_PARAMS}"
-            gerrit_host="ssh://${CI_BOT_USERNAME}@${GERRIT_HOST}:29418"
-            new_branch=${GERRIT_REFNAME}
-            forked_tag=${new_branch##*-}
+          SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa"
+          export GIT_SSH_COMMAND="ssh -p 29418 -i $CI_BOT_KEY ${SSH_PARAMS}"
+          gerrit_host="ssh://${CI_BOT_USERNAME}@${GERRIT_HOST}:29418"
+          new_branch=${GERRIT_REFNAME}
+          forked_tag=${new_branch##*-}
 
-            _workdir=$(mktemp -d)
-            rm -f email.txt || true
-            trap '[ -d "${_workdir}" ] && rm -rf "${_workdir}"' EXIT
-            git -C "${_workdir}" init > /dev/null 2>&1
+          _workdir=$(mktemp -d)
+          rm -f email.txt || true
+          trap '[ -d "${_workdir}" ] && rm -rf "${_workdir}"' EXIT
+          git -C "${_workdir}" init > /dev/null 2>&1
 
-            # Check if the job is triggered by a new LTS branch creation
-            new_lts_branch=-1
-            # Verify if the branch already exists in the Hafnium project.
-            git -C "${_workdir}" ls-remote --exit-code ${gerrit_host}/hafnium/hafnium ${new_branch} || new_lts_branch=1
-            # Check if the job is not triggered by delete branch
-            git -C "${_workdir}" ls-remote --exit-code ${gerrit_host}/${GERRIT_PROJECT} ${new_branch} || new_lts_branch=-1
-            if [ ${new_lts_branch} -eq -1 ]; then
-                echo "No new LTS branch created! exit job"
-            	exit 0
-            fi
+          # Check if the job is triggered by a new LTS branch creation
+          new_lts_branch=-1
+          # Verify if the branch already exists in the Hafnium project.
+          git -C "${_workdir}" ls-remote --exit-code ${gerrit_host}/hafnium/hafnium ${new_branch} || new_lts_branch=1
+          # Check if the job is not triggered by delete branch
+          git -C "${_workdir}" ls-remote --exit-code ${gerrit_host}/${GERRIT_PROJECT} ${new_branch} || new_lts_branch=-1
+          if [ ${new_lts_branch} -eq -1 ]; then
+              echo "No new LTS branch created! exit job"
+          	exit 0
+          fi
 
-            # Create new LTS branch to related repositories
-            repos="hafnium/hafnium TF-A/tf-a-tests ci/tf-a-ci-scripts ci/tf-a-job-configs"
-            for r in ${repos};
-            do
-                echo "Create branch \"${new_branch}\" from tag \"${forked_tag}\" in the \"${r}\" project"
-                git -C "${_workdir}" fetch ${gerrit_host}/${r} ${forked_tag}
-                git -C "${_workdir}" push ${gerrit_host}/${r} FETCH_HEAD^{commit}:refs/heads/${new_branch}
-            done
+          # Create new LTS branch to related repositories
+          repos="hafnium/hafnium TF-A/tf-a-tests ci/tf-a-ci-scripts ci/tf-a-job-configs"
+          for r in ${repos};
+          do
+              echo "Create branch \"${new_branch}\" from tag \"${forked_tag}\" in the \"${r}\" project"
+              git -C "${_workdir}" fetch ${gerrit_host}/${r} ${forked_tag}
+              git -C "${_workdir}" push ${gerrit_host}/${r} FETCH_HEAD^{commit}:refs/heads/${new_branch}
+          done
 
-            # Create new download space
-            echo "Create new download space for \"${new_branch}\""
-            aws s3 sync s3://trustedfirmware-prod-storage/tf-a s3://openci-trustedfirmware-storage-prod/tf-a-${new_branch}
+          # Create new download space
+          echo "Create new download space for \"${new_branch}\""
+          aws s3 sync s3://trustedfirmware-prod-storage/tf-a s3://openci-trustedfirmware-storage-prod/tf-a-${new_branch}
 
-            echo "CI Environment Setup for ${new_branch} branch Completed" > subject.txt
-            cat << EOF >email.txt
-            Hello,
-            The new LTS branch "${new_branch}" has been created in the following repositoris
-            ${repos}
+          echo "CI Environment Setup for ${new_branch} branch Completed" > subject.txt
+          cat << EOF >email.txt
+          Hello,
+          The new LTS branch "${new_branch}" has been created in the following repositoris
+          ${repos}
 
-            And the new download space is ready on ${DOWNLOAD_SERVER_URL}/tf-a-${new_branch}
+          And the new download space is ready on ${DOWNLOAD_SERVER_URL}/tf-a-${new_branch}
 
-            Please check the job log for the details
-            ${BUILD_URL}console
+          Please check the job log for the details
+          ${BUILD_URL}console
 
-            EOF
+          EOF
 
-            echo "--------- email body ----------"
-            cat email.txt
-
+          echo "--------- email body ----------"
+          cat email.txt
     publishers:
       - conditional-publisher:
           - condition-kind: file-exists
@@ -112,5 +110,5 @@
               - email-ext:
                   always: true
                   recipients: ${EMAIL_RECIPIENT}
-                  subject: '${FILE,path="subject.txt"}'
-                  body: '${FILE,path="email.txt"}'
+                  subject: ${FILE,path="subject.txt"}
+                  body: ${FILE,path="email.txt"}
diff --git a/tf-a-lts-cleanup.yaml b/tf-a-lts-cleanup.yaml
index 7e44c2f..79c9a17 100644
--- a/tf-a-lts-cleanup.yaml
+++ b/tf-a-lts-cleanup.yaml
@@ -6,28 +6,28 @@
     disabled: false
     description: Cleanup stale LTS sandbox tags/branches
     properties:
-    - build-discarder:
-        days-to-keep: 180
-        num-to-keep: 30
+      - build-discarder:
+          days-to-keep: 180
+          num-to-keep: 30
     triggers:
-        - timed: 'H 3 * * 0,3'
+      - timed: H 3 * * 0,3
     wrappers:
-        - credentials-binding:
+      - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
-        - timestamps
+              passphrase-variable: ""
+      - timestamps
     builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
+      - shell: |
+          #!/bin/bash
+          set -ex
 
-            mkdir -p ~/.ssh/
-            ssh-keyscan -p 29418 review.trustedfirmware.org >> ~/.ssh/known_hosts
-            export GIT_SSH_COMMAND="ssh -i $CI_BOT_KEY -o 'PubkeyAcceptedKeyTypes +ssh-rsa'"
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p 29418 review.trustedfirmware.org >> ~/.ssh/known_hosts
+          export GIT_SSH_COMMAND="ssh -i $CI_BOT_KEY -o 'PubkeyAcceptedKeyTypes +ssh-rsa'"
 
-            git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-            cd tf-a-ci-scripts/lts
-            ./lts-cleanup-sandbox-refs.py --user $CI_BOT_USERNAME --limit 1
+          git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          cd tf-a-ci-scripts/lts
+          ./lts-cleanup-sandbox-refs.py --user $CI_BOT_USERNAME --limit 1
diff --git a/tf-a-lts-create-release.yaml b/tf-a-lts-create-release.yaml
index c1eaf25..b5ecdb3 100644
--- a/tf-a-lts-create-release.yaml
+++ b/tf-a-lts-create-release.yaml
@@ -6,102 +6,102 @@
     disabled: false
     description: Create a new TF-A LTS release from a tip of an LTS branch.
     properties:
-    - build-discarder:
-        days-to-keep: 365
-        num-to-keep: 30
+      - build-discarder:
+          days-to-keep: 365
+          num-to-keep: 30
     parameters:
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-            description: |
-              TF-A Git project
-        - string:
-            name: GERRIT_BRANCH
-            default: 'lts-v2.10'
-            description: |
-              Git branch to release from (lts-v2.8, lts-v2.10, etc.)
-        - bool:
-            name: SANDBOX_RUN
-            default: true
-            description: |
-              Run sandbox simulation of a release. A tag will be created in
-              separate "sandbox" namespace, and further actions like docs
-              publishing or release email sending will be also sandboxed.
-              Uncheck this only after running a simulation and verifying that
-              everything is correct!
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+          description: |
+            TF-A Git project
+      - string:
+          name: GERRIT_BRANCH
+          default: lts-v2.10
+          description: |
+            Git branch to release from (lts-v2.8, lts-v2.10, etc.)
+      - bool:
+          name: SANDBOX_RUN
+          default: true
+          description: |
+            Run sandbox simulation of a release. A tag will be created in
+            separate "sandbox" namespace, and further actions like docs
+            publishing or release email sending will be also sandboxed.
+            Uncheck this only after running a simulation and verifying that
+            everything is correct!
     wrappers:
-        - credentials-binding:
+      - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
-        - timestamps
+              passphrase-variable: ""
+      - timestamps
     builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-            env | grep GERRIT
-            echo SANDBOX_RUN=$SANDBOX_RUN
-            git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-            git clone https://$GERRIT_HOST/$GERRIT_PROJECT
-            DIR=$(basename $GERRIT_PROJECT)
-            cd $DIR
-            git checkout $GERRIT_BRANCH
-            set +x
-            nvm install
-            set -x
-            npm install --no-save standard-version
-            #git tag
+      - shell: |
+          #!/bin/bash
+          set -ex
+          env | grep GERRIT
+          echo SANDBOX_RUN=$SANDBOX_RUN
+          git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          git clone https://$GERRIT_HOST/$GERRIT_PROJECT
+          DIR=$(basename $GERRIT_PROJECT)
+          cd $DIR
+          git checkout $GERRIT_BRANCH
+          set +x
+          nvm install
+          set -x
+          npm install --no-save standard-version
+          #git tag
 
-            echo "" >> readme.rst
-            git config user.email "ci@trustedfirmware.org"
-            git config user.name "Release CI"
-            # Install Change-Id hook
-            f="$(git rev-parse --git-dir)/hooks/commit-msg"; curl -o "$f" https://review.trustedfirmware.org/tools/hooks/commit-msg ; chmod +x "$f"
+          echo "" >> readme.rst
+          git config user.email "ci@trustedfirmware.org"
+          git config user.name "Release CI"
+          # Install Change-Id hook
+          f="$(git rev-parse --git-dir)/hooks/commit-msg"; curl -o "$f" https://review.trustedfirmware.org/tools/hooks/commit-msg ; chmod +x "$f"
 
-            if [ "$SANDBOX_RUN" == "true" ]; then
-                git commit -a -s -m "fix(readme): dummy commit for sandbox release"
-            fi
+          if [ "$SANDBOX_RUN" == "true" ]; then
+              git commit -a -s -m "fix(readme): dummy commit for sandbox release"
+          fi
 
-            python3 $WORKSPACE/tf-a-ci-scripts/lts/lts-mangle-change-log.py remove-prefix docs/change-log.md >docs/change-log.md.tmp
-            mv docs/change-log.md.tmp docs/change-log.md
-            npm run release -- --release-as patch --tag-prefix lts-v
-            python3 $WORKSPACE/tf-a-ci-scripts/lts/lts-mangle-change-log.py add-prefix docs/change-log.md >docs/change-log.md.tmp
-            mv docs/change-log.md.tmp docs/change-log.md
+          python3 $WORKSPACE/tf-a-ci-scripts/lts/lts-mangle-change-log.py remove-prefix docs/change-log.md >docs/change-log.md.tmp
+          mv docs/change-log.md.tmp docs/change-log.md
+          npm run release -- --release-as patch --tag-prefix lts-v
+          python3 $WORKSPACE/tf-a-ci-scripts/lts/lts-mangle-change-log.py add-prefix docs/change-log.md >docs/change-log.md.tmp
+          mv docs/change-log.md.tmp docs/change-log.md
 
-            RELEASE=$(grep release docs/conf.py | sed -r -e 's/release = "(.*)"/\1/')
+          RELEASE=$(grep release docs/conf.py | sed -r -e 's/release = "(.*)"/\1/')
 
-            git diff
-            git commit -a -s -m "docs(changelog): changelog for lts-v${RELEASE} release"
-            if [ "$SANDBOX_RUN" == "true" ]; then
-                TAG="sandbox/lts-v${RELEASE}-$(date +%Y%m%dT%H%M)"
-            else
-                TAG="lts-v${RELEASE}"
-            fi
-            git tag $TAG
+          git diff
+          git commit -a -s -m "docs(changelog): changelog for lts-v${RELEASE} release"
+          if [ "$SANDBOX_RUN" == "true" ]; then
+              TAG="sandbox/lts-v${RELEASE}-$(date +%Y%m%dT%H%M)"
+          else
+              TAG="lts-v${RELEASE}"
+          fi
+          git tag $TAG
 
-            mkdir -p ~/.ssh/
-            ssh-keyscan -p 29418 $GERRIT_HOST >> ~/.ssh/known_hosts
-            export GIT_SSH_COMMAND="ssh -i $CI_BOT_KEY -o 'PubkeyAcceptedKeyTypes +ssh-rsa'"
+          mkdir -p ~/.ssh/
+          ssh-keyscan -p 29418 $GERRIT_HOST >> ~/.ssh/known_hosts
+          export GIT_SSH_COMMAND="ssh -i $CI_BOT_KEY -o 'PubkeyAcceptedKeyTypes +ssh-rsa'"
 
-            #git push ssh://$CI_BOT_USERNAME@$GERRIT_HOST:29418/$GERRIT_PROJECT HEAD:refs/for/$GERRIT_BRANCH
+          #git push ssh://$CI_BOT_USERNAME@$GERRIT_HOST:29418/$GERRIT_PROJECT HEAD:refs/for/$GERRIT_BRANCH
 
-            if [ "$SANDBOX_RUN" == "false" ]; then
-                # Push to the LTS branch
-                git push ssh://$CI_BOT_USERNAME@$GERRIT_HOST:29418/$GERRIT_PROJECT
-            else
-                # If it's sandbox run, we still need to push commit to some branch,
-                # because otherwise the tag won't be visible in Gerrit (due to ACL
-                # model Gerrit uses: it resolve tag to a branch it belongs to, then
-                # checks ACLs on branch to see if a user has access to it; no branch
-                # == problems).
-                git push ssh://${CI_BOT_USERNAME}@${GERRIT_HOST}:29418/${GERRIT_PROJECT} HEAD:refs/heads/${TAG}-br
-            fi
-            # Push tag
-            git push ssh://$CI_BOT_USERNAME@$GERRIT_HOST:29418/$GERRIT_PROJECT $TAG
+          if [ "$SANDBOX_RUN" == "false" ]; then
+              # Push to the LTS branch
+              git push ssh://$CI_BOT_USERNAME@$GERRIT_HOST:29418/$GERRIT_PROJECT
+          else
+              # If it's sandbox run, we still need to push commit to some branch,
+              # because otherwise the tag won't be visible in Gerrit (due to ACL
+              # model Gerrit uses: it resolve tag to a branch it belongs to, then
+              # checks ACLs on branch to see if a user has access to it; no branch
+              # == problems).
+              git push ssh://${CI_BOT_USERNAME}@${GERRIT_HOST}:29418/${GERRIT_PROJECT} HEAD:refs/heads/${TAG}-br
+          fi
+          # Push tag
+          git push ssh://$CI_BOT_USERNAME@$GERRIT_HOST:29418/$GERRIT_PROJECT $TAG
 
-            echo Release tag is created. Further processing happens in the job ${JENKINS_PUBLIC_URL}job/tf-a-lts-release-tagged
+          echo Release tag is created. Further processing happens in the job ${JENKINS_PUBLIC_URL}job/tf-a-lts-release-tagged
diff --git a/tf-a-lts-docs-watcher.yaml b/tf-a-lts-docs-watcher.yaml
index aa8c4d6..9df119d 100644
--- a/tf-a-lts-docs-watcher.yaml
+++ b/tf-a-lts-docs-watcher.yaml
@@ -3,47 +3,36 @@
     node: master
     project-type: freestyle
     concurrent: false
-    description:
-      This job was superceded by tf-a-lts-release-docs as part of
-      larger-scale release automation efforts
-      (https://linaro.atlassian.net/browse/TFC-545). It is expected
-      to be removed after new setup is better tested (tentatively
-      by 2024-06-01).
-      ---
-      Triggers whenever a code change is merged into the lts branch 
-      or a lts tag is created of the TF-A repository. Executes a webhook
-      to trigger the ReadTheDocs service to build a fresh copy of the 
-      documentation for one or more branches.
+    description: This job was superceded by tf-a-lts-release-docs as part of larger-scale release automation efforts (https://linaro.atlassian.net/browse/TFC-545). It is expected to be removed after new setup is better tested (tentatively by 2024-06-01). --- Triggers whenever a code change is merged into the lts branch or a lts tag is created of the TF-A repository. Executes a webhook to trigger the ReadTheDocs service to build a fresh copy of the documentation for one or more branches.
     disabled: true
     builders:
-    - shell:
-        !include-raw: scripts/tf-a-lts-docs-watcher.sh
+      - shell: !include-raw: scripts/tf-a-lts-docs-watcher.sh
     properties:
-    - build-discarder:
-        days-to-keep: 60
-        num-to-keep: 10
+      - build-discarder:
+          days-to-keep: 60
+          num-to-keep: 10
     triggers:
-    - gerrit:
-        silent: true
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: REG_EXP
-            branch-pattern: 'lts-v.*'
-          - branch-compare-type: REG_EXP
-            branch-pattern: refs/tags/lts-v.*
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        trigger-on:
-        - ref-updated-event
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: lts-v.*
+                - branch-compare-type: REG_EXP
+                  branch-pattern: refs/tags/lts-v.*
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+          trigger-on:
+            - ref-updated-event
     wrappers:
-    - timestamps
-    - credentials-binding:
-      - text:
-          credential-id: TF-A-RTD-API-TOKEN
-          variable: RTD_API_TOKEN
-      - text:
-          credential-id: Trusted_Firmware_ReadTheDocs_Token
-          variable: RTD_WEBHOOK_SECRET
+      - timestamps
+      - credentials-binding:
+          - text:
+              credential-id: TF-A-RTD-API-TOKEN
+              variable: RTD_API_TOKEN
+          - text:
+              credential-id: Trusted_Firmware_ReadTheDocs_Token
+              variable: RTD_WEBHOOK_SECRET
     publishers:
-    - workspace-cleanup
+      - workspace-cleanup
diff --git a/tf-a-lts-patch-stack-watcher.yaml b/tf-a-lts-patch-stack-watcher.yaml
index 5c472f0..5a26685 100644
--- a/tf-a-lts-patch-stack-watcher.yaml
+++ b/tf-a-lts-patch-stack-watcher.yaml
@@ -3,70 +3,66 @@
     node: docker-amd64-tf-a-jammy
     project-type: freestyle
     concurrent: false
-    description:
-        This job will trigger Allow-CI job whenever a new patch is created.
-        It also monitors all patches, if submit requirement is met, it
-        will merge the patch
+    description: This job will trigger Allow-CI job whenever a new patch is created. It also monitors all patches, if submit requirement is met, it will merge the patch
     disabled: false
     parameters:
-    - bool:
-        name: ENABLE_PATCH_AUTO_SUBMISSION
-        description: |
-          Enable patch auto submission function
-        default: true
-    - bool:
-        name: ENABLE_AUTO_ALLOW_CI_JOB
-        description: |
-          Enable auto submit Allow-CI job
-        default: true
-    - string:
-        name: ALLOW_CI_JOB
-        description: |
-          To trigger Allow-CI+1 or Allow-CI+2 job when a new patch is created
-        default: 'Allow-CI=2'
+      - bool:
+          name: ENABLE_PATCH_AUTO_SUBMISSION
+          description: |
+            Enable patch auto submission function
+          default: true
+      - bool:
+          name: ENABLE_AUTO_ALLOW_CI_JOB
+          description: |
+            Enable auto submit Allow-CI job
+          default: true
+      - string:
+          name: ALLOW_CI_JOB
+          description: |
+            To trigger Allow-CI+1 or Allow-CI+2 job when a new patch is created
+          default: Allow-CI=2
     builders:
-    - shell:
-        !include-raw: scripts/tf-a-lts-patch-stack-watcher.sh
+      - shell: !include-raw: scripts/tf-a-lts-patch-stack-watcher.sh
     properties:
-    - build-discarder:
-        days-to-keep: 60
-        num-to-keep: 120
+      - build-discarder:
+          days-to-keep: 60
+          num-to-keep: 120
     triggers:
-    - gerrit:
-        silent: true
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: REG_EXP
-            branch-pattern: 'lts-v.*'
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        trigger-on:
-        - comment-added-event:
-            approval-category: "Verified"
-            approval-value: 1
-        - comment-added-event:
-            approval-category: "Code-Owner-Review"
-            approval-value: 1
-        - comment-added-event:
-            approval-category: "Allow-CI"
-            approval-value: 1
-        - comment-added-event:
-            approval-category: "Maintainer-Review"
-            approval-value: 1
-        - patchset-created-event:
-            exclude-drafts: false
-            exclude-trivial-rebase: false
-            exclude-no-code-change: false
-            exclude-private: false
-            exclude-wip: false
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: lts-v.*
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+          trigger-on:
+            - comment-added-event:
+                approval-category: Verified
+                approval-value: 1
+            - comment-added-event:
+                approval-category: Code-Owner-Review
+                approval-value: 1
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+            - comment-added-event:
+                approval-category: Maintainer-Review
+                approval-value: 1
+            - patchset-created-event:
+                exclude-drafts: false
+                exclude-trivial-rebase: false
+                exclude-no-code-change: false
+                exclude-private: false
+                exclude-wip: false
     wrappers:
-    - timestamps
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
+      - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
     publishers:
-    - workspace-cleanup
+      - workspace-cleanup
diff --git a/tf-a-lts-release-docs.yaml b/tf-a-lts-release-docs.yaml
index 99f4a44..4b17a72 100644
--- a/tf-a-lts-release-docs.yaml
+++ b/tf-a-lts-release-docs.yaml
@@ -8,60 +8,59 @@
     description: |
       Publish TF-A LTS docs for a release on ReadTheDocs site
     properties:
-        - build-discarder:
-            days-to-keep: 365
-            num-to-keep: 50
+      - build-discarder:
+          days-to-keep: 365
+          num-to-keep: 50
     parameters:
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: GERRIT_PROJECT
-            default: 'sandbox/pfalcon/trusted-firmware-a'
-            description: |
-              TF-A Git project
-        - string:
-            name: GERRIT_BRANCH
-            default: ''
-            description: |
-              Git branch (e.g. lts-v2.8)
-        - string:
-            name: GERRIT_REFNAME
-            default: ''
-            description: |
-              Git refname
-        - string:
-            name: RELEASE_TAG
-            default: '--latest'
-            description: |
-              Release git tag, e.g. 'lts-v2.8.10'
-        - bool:
-            name: SANDBOX_RUN
-            default: true
-            description: |
-              Run sandbox simulation of a release. Uncheck this only after
-              running simulation and checking that everything is correct!
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: GERRIT_PROJECT
+          default: sandbox/pfalcon/trusted-firmware-a
+          description: |
+            TF-A Git project
+      - string:
+          name: GERRIT_BRANCH
+          default: ""
+          description: |
+            Git branch (e.g. lts-v2.8)
+      - string:
+          name: GERRIT_REFNAME
+          default: ""
+          description: |
+            Git refname
+      - string:
+          name: RELEASE_TAG
+          default: --latest
+          description: |
+            Release git tag, e.g. 'lts-v2.8.10'
+      - bool:
+          name: SANDBOX_RUN
+          default: true
+          description: |
+            Run sandbox simulation of a release. Uncheck this only after
+            running simulation and checking that everything is correct!
     wrappers:
-    - timestamps
-    - timeout:
-        timeout: 60
-        fail: true
-    - credentials-binding:
-      - text:
-          credential-id: TF-A-RTD-API-TOKEN
-          variable: RTD_API_TOKEN
-      - text:
-          credential-id: Trusted_Firmware_ReadTheDocs_Token
-          variable: RTD_WEBHOOK_SECRET
-      - text:
-          credential-id: TFA_SANDBOX_RTD_WEBHOOK_SECRET
-          variable: TFA_SANDBOX_RTD_WEBHOOK_SECRET
-      - text:
-          credential-id: PFALCON_RTD_API_TOKEN
-          variable: PFALCON_RTD_API_TOKEN
-      - text:
-          credential-id: PFALCON_RTD_WEBHOOK_SECRET
-          variable: PFALCON_RTD_WEBHOOK_SECRET
+      - timestamps
+      - timeout:
+          timeout: 60
+          fail: true
+      - credentials-binding:
+          - text:
+              credential-id: TF-A-RTD-API-TOKEN
+              variable: RTD_API_TOKEN
+          - text:
+              credential-id: Trusted_Firmware_ReadTheDocs_Token
+              variable: RTD_WEBHOOK_SECRET
+          - text:
+              credential-id: TFA_SANDBOX_RTD_WEBHOOK_SECRET
+              variable: TFA_SANDBOX_RTD_WEBHOOK_SECRET
+          - text:
+              credential-id: PFALCON_RTD_API_TOKEN
+              variable: PFALCON_RTD_API_TOKEN
+          - text:
+              credential-id: PFALCON_RTD_WEBHOOK_SECRET
+              variable: PFALCON_RTD_WEBHOOK_SECRET
     builders:
-    - shell:
-        !include-raw: scripts/tf-a-lts-docs-watcher.sh
+      - shell: !include-raw: scripts/tf-a-lts-docs-watcher.sh
diff --git a/tf-a-lts-release-mail.yaml b/tf-a-lts-release-mail.yaml
index ddbea22..9ec5c0c 100644
--- a/tf-a-lts-release-mail.yaml
+++ b/tf-a-lts-release-mail.yaml
@@ -8,87 +8,87 @@
     description: |
       Render TF-A LTS release email template.
     properties:
-        - build-discarder:
-            days-to-keep: 365
-            num-to-keep: 50
+      - build-discarder:
+          days-to-keep: 365
+          num-to-keep: 50
     parameters:
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-            description: |
-              TF-A Git project
-        - string:
-            name: GERRIT_BRANCH
-            default: ''
-            description: |
-              Git branch (e.g. lts-v2.8) to search for the latest tag in case of --latest is used for RELEASE_TAG
-        - string:
-            name: RELEASE_TAG
-            default: '--latest'
-            description: |
-              Release git tag, e.g. 'lts-v2.8.10', or '--latest' to get latest tag in GERRIT_BRANCH
-        - bool:
-            name: SANDBOX_RUN
-            default: true
-            description: |
-              Run sandbox simulation of a release. Uncheck this only after
-              running simulation and checking that everything is correct!
-#    triggers:
-#    - gerrit:
-#        silent: true
-#        server-name: 'review.trustedfirmware.org'
-#        projects:
-#        - branches:
-#          - branch-compare-type: PLAIN
-#            branch-pattern: integration
-#          project-compare-type: PLAIN
-#          project-pattern: 'TF-A/trusted-firmware-a'
-#        trigger-on:
-#        - patchset-created-event
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+          description: |
+            TF-A Git project
+      - string:
+          name: GERRIT_BRANCH
+          default: ""
+          description: |
+            Git branch (e.g. lts-v2.8) to search for the latest tag in case of --latest is used for RELEASE_TAG
+      - string:
+          name: RELEASE_TAG
+          default: --latest
+          description: |
+            Release git tag, e.g. 'lts-v2.8.10', or '--latest' to get latest tag in GERRIT_BRANCH
+      - bool:
+          name: SANDBOX_RUN
+          default: true
+          description: |
+            Run sandbox simulation of a release. Uncheck this only after
+            running simulation and checking that everything is correct!
+          #    triggers:
+          #    - gerrit:
+          #        silent: true
+          #        server-name: 'review.trustedfirmware.org'
+          #        projects:
+          #        - branches:
+          #          - branch-compare-type: PLAIN
+          #            branch-pattern: integration
+          #          project-compare-type: PLAIN
+          #          project-pattern: 'TF-A/trusted-firmware-a'
+          #        trigger-on:
+          #        - patchset-created-event
     wrappers:
-    - timestamps
-    - timeout:
-        timeout: 5
-        fail: true
+      - timestamps
+      - timeout:
+          timeout: 5
+          fail: true
     builders:
-    - shell: |
-        #!/bin/bash
-        set -ex
+      - shell: |
+          #!/bin/bash
+          set -ex
 
-        git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-        ./tf-a-ci-scripts/lts/lts-release-mail.py --url https://${GERRIT_HOST}/${GERRIT_PROJECT} --branch "${GERRIT_BRANCH}" ${RELEASE_TAG} >email.txt
-        awk -F": " '/Subject:/ {print $2}' email.txt >subject.txt
-        # Remove email headers, put in a seperate file.
-        sed '0,/^$/d' email.txt >body.txt
+          git clone https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          ./tf-a-ci-scripts/lts/lts-release-mail.py --url https://${GERRIT_HOST}/${GERRIT_PROJECT} --branch "${GERRIT_BRANCH}" ${RELEASE_TAG} >email.txt
+          awk -F": " '/Subject:/ {print $2}' email.txt >subject.txt
+          # Remove email headers, put in a seperate file.
+          sed '0,/^$/d' email.txt >body.txt
 
-        if [ "$SANDBOX_RUN" == "true" ]; then
-            echo "Bipin.Ravi@arm.com, vwadekar@nvidia.com, yann.gautier@st.com, jidong@google.com, govindraj.raja@arm.com" >recipients.txt
-            echo -n "[SANDBOX] " | cat - subject.txt > subject.txt.tmp
-            mv subject.txt.tmp subject.txt
-        else
-            echo "tfa-lts@lists.trustedfirmware.org, tf-a@lists.trustedfirmware.org" >recipients.txt
-        fi
+          if [ "$SANDBOX_RUN" == "true" ]; then
+              echo "Bipin.Ravi@arm.com, vwadekar@nvidia.com, yann.gautier@st.com, jidong@google.com, govindraj.raja@arm.com" >recipients.txt
+              echo -n "[SANDBOX] " | cat - subject.txt > subject.txt.tmp
+              mv subject.txt.tmp subject.txt
+          else
+              echo "tfa-lts@lists.trustedfirmware.org, tf-a@lists.trustedfirmware.org" >recipients.txt
+          fi
 
-        set +x
-        echo "======================================================================="
-        cat email.txt
-        echo "======================================================================="
+          set +x
+          echo "======================================================================="
+          cat email.txt
+          echo "======================================================================="
     publishers:
-        - archive:
-            artifacts: email.txt
-            latest-only: false
-            allow-empty: true
-        - conditional-publisher:
+      - archive:
+          artifacts: email.txt
+          latest-only: false
+          allow-empty: true
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: email.txt
             condition-basedir: workspace
             action:
-            - email-ext:
-                always: true
-                subject: '${FILE, path="subject.txt"}'
-                body: '${FILE, path="body.txt"}'
-                recipients: '${FILE, path="recipients.txt"}'
+              - email-ext:
+                  always: true
+                  subject: ${FILE, path="subject.txt"}
+                  body: ${FILE, path="body.txt"}
+                  recipients: ${FILE, path="recipients.txt"}
diff --git a/tf-a-lts-release-tagged.yaml b/tf-a-lts-release-tagged.yaml
index b480969..a73c444 100644
--- a/tf-a-lts-release-tagged.yaml
+++ b/tf-a-lts-release-tagged.yaml
@@ -6,52 +6,52 @@
     disabled: false
     description: Triggers when a new LTS release is tagged
     properties:
-    - build-discarder:
-        days-to-keep: 90
-        num-to-keep: 60
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: REG_EXP
-            branch-pattern: refs/tags/lts-v.*
-          - branch-compare-type: REG_EXP
-            branch-pattern: refs/tags/sandbox/lts-v.*
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        - branches:
-          - branch-compare-type: REG_EXP
-            branch-pattern: refs/tags/lts-v.*
-          - branch-compare-type: REG_EXP
-            branch-pattern: refs/tags/sandbox/lts-v.*
-          project-compare-type: PLAIN
-          project-pattern: 'sandbox/pfalcon/trusted-firmware-a'
-        trigger-on:
-        - ref-updated-event
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: refs/tags/lts-v.*
+                - branch-compare-type: REG_EXP
+                  branch-pattern: refs/tags/sandbox/lts-v.*
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+            - branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: refs/tags/lts-v.*
+                - branch-compare-type: REG_EXP
+                  branch-pattern: refs/tags/sandbox/lts-v.*
+              project-compare-type: PLAIN
+              project-pattern: sandbox/pfalcon/trusted-firmware-a
+          trigger-on:
+            - ref-updated-event
     wrappers:
-        - timestamps
+      - timestamps
     builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-            env | grep GERRIT
-            if ! echo $GERRIT_REFNAME | grep -q -E ^refs/tags/; then
-                echo Not a tag event
-                exit
-            fi
-            echo "RELEASE_TAG=${GERRIT_REFNAME#refs/tags/}" >subjob.param
-            if echo ${GERRIT_REFNAME} | grep -q "sandbox/"; then
-                echo "SANDBOX_RUN=true" >>subjob.param
-            else
-                echo "SANDBOX_RUN=false" >>subjob.param
-            fi
-        - conditional-step:
-            condition-kind: file-exists
-            on-evaluation-failure: dont-run
-            condition-filename: subjob.param
-            condition-basedir: workspace
-            steps:
+      - shell: |
+          #!/bin/bash
+          set -ex
+          env | grep GERRIT
+          if ! echo $GERRIT_REFNAME | grep -q -E ^refs/tags/; then
+              echo Not a tag event
+              exit
+          fi
+          echo "RELEASE_TAG=${GERRIT_REFNAME#refs/tags/}" >subjob.param
+          if echo ${GERRIT_REFNAME} | grep -q "sandbox/"; then
+              echo "SANDBOX_RUN=true" >>subjob.param
+          else
+              echo "SANDBOX_RUN=false" >>subjob.param
+          fi
+      - conditional-step:
+          condition-kind: file-exists
+          on-evaluation-failure: dont-run
+          condition-filename: subjob.param
+          condition-basedir: workspace
+          steps:
             - trigger-builds:
                 - project:
                     - tf-a-lts-release-docs
diff --git a/tf-a-lts-triage-v2.yaml b/tf-a-lts-triage-v2.yaml
index 7a9b0bd..7dc6cf1 100644
--- a/tf-a-lts-triage-v2.yaml
+++ b/tf-a-lts-triage-v2.yaml
@@ -8,78 +8,78 @@
     description: |
       Generate LTS triage report every Friday
     properties:
-        - build-discarder:
-            days-to-keep: 45
-            num-to-keep: 200
-            artifact-num-to-keep: 100
+      - build-discarder:
+          days-to-keep: 45
+          num-to-keep: 200
+          artifact-num-to-keep: 100
     parameters:
-        - string:
-            name: TFA_REPO
-            default: 'https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git'
-            description: The trusted-firmware-a repo to clone from
-        - string:
-            name: TFA_CI_SCRIPT_REPO
-            default: 'https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git'
-            description: The tf-a-ci-script repo to clone from
-        - string:
-            name: LTS_BRANCHES
-            default: 'lts-v2.8 lts-v2.10 lts-v2.12'
-            description: |
-              LTS branch
+      - string:
+          name: TFA_REPO
+          default: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
+          description: The trusted-firmware-a repo to clone from
+      - string:
+          name: TFA_CI_SCRIPT_REPO
+          default: https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          description: The tf-a-ci-script repo to clone from
+      - string:
+          name: LTS_BRANCHES
+          default: lts-v2.8 lts-v2.10 lts-v2.12
+          description: |
+            LTS branch
     triggers:
-    - timed: "H 5 * * 5"    # Run the job at 00:00 every Friday @CTS timezone
+      - timed: H 5 * * 5 # Run the job at 00:00 every Friday @CTS timezone
     wrappers:
-    - timestamps
-    - timeout:
-        timeout: 30
-        fail: true
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
+      - timestamps
+      - timeout:
+          timeout: 30
+          fail: true
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
     builders:
-    - shell: |
-        #!/bin/bash
-        set -ex
+      - shell: |
+          #!/bin/bash
+          set -ex
 
-        DATE=$(date +'%Y-%m-%d')
-        START_PATH=$(pwd)
-        LTS_TMP_DIR=$(mktemp -d -p ./)
-        cd $LTS_TMP_DIR
+          DATE=$(date +'%Y-%m-%d')
+          START_PATH=$(pwd)
+          LTS_TMP_DIR=$(mktemp -d -p ./)
+          cd $LTS_TMP_DIR
 
-        git clone ${TFA_CI_SCRIPT_REPO}
+          git clone ${TFA_CI_SCRIPT_REPO}
 
-        TFA_TMP_DIR=$(mktemp -d -p ./)
-        cd ${TFA_TMP_DIR}
-        git clone ${TFA_REPO} -b integration ./
-        LTS_REPO_PATH=$(pwd)
-        cd -
-        for b in ${LTS_BRANCHES};
-        do
-            CSV_REPORT="${b}_${DATE}.csv"
-            git -C ${LTS_REPO_PATH} checkout -b ${b} origin/${b}
+          TFA_TMP_DIR=$(mktemp -d -p ./)
+          cd ${TFA_TMP_DIR}
+          git clone ${TFA_REPO} -b integration ./
+          LTS_REPO_PATH=$(pwd)
+          cd -
+          for b in ${LTS_BRANCHES};
+          do
+              CSV_REPORT="${b}_${DATE}.csv"
+              git -C ${LTS_REPO_PATH} checkout -b ${b} origin/${b}
 
-            python3 tf-a-ci-scripts/lts/lts-triage-v2.py --repo ${LTS_REPO_PATH} --csv_path ${START_PATH}/${CSV_REPORT} \
-            --lts ${b} --gerrit_user ${CI_BOT_USERNAME} --ssh_keyfile ${CI_BOT_KEY} --debug
-            [ -f "${START_PATH}/${CSV_REPORT}" ] && echo "${CSV_REPORT}" >> ${START_PATH}/got_report.txt
-        done
+              python3 tf-a-ci-scripts/lts/lts-triage-v2.py --repo ${LTS_REPO_PATH} --csv_path ${START_PATH}/${CSV_REPORT} \
+              --lts ${b} --gerrit_user ${CI_BOT_USERNAME} --ssh_keyfile ${CI_BOT_KEY} --debug
+              [ -f "${START_PATH}/${CSV_REPORT}" ] && echo "${CSV_REPORT}" >> ${START_PATH}/got_report.txt
+          done
 
-        cd ${START_PATH}
-        rm -rf ${LTS_TMP_DIR}
+          cd ${START_PATH}
+          rm -rf ${LTS_TMP_DIR}
     publishers:
-        - conditional-publisher:
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: got_report.txt
             condition-basedir: workspace
             action:
-            - archive:
-                artifacts: '*.csv'
-            - email-ext:
-                always: true
-                recipients: "arthur.she@linaro.org, bipin.ravi@arm.com, vwadekar@nvidia.com, joanna.farley@arm.com, lauren.wehrmeister@arm.com, yann.gautier@st.com, jidong@google.com, olivier.deprez@arm.com, Govindraj.Raja@arm.com"
-                subject: "TF-A LTS Triage report"
-                body: "Attached is the CSV report from the TF-A LTS Triage job this week."
-                attachments: "*.csv"
+              - archive:
+                  artifacts: '*.csv'
+              - email-ext:
+                  always: true
+                  recipients: arthur.she@linaro.org, bipin.ravi@arm.com, vwadekar@nvidia.com, joanna.farley@arm.com, lauren.wehrmeister@arm.com, yann.gautier@st.com, jidong@google.com, olivier.deprez@arm.com, Govindraj.Raja@arm.com
+                  subject: TF-A LTS Triage report
+                  body: Attached is the CSV report from the TF-A LTS Triage job this week.
+                  attachments: '*.csv'
diff --git a/tf-a-lts-verified-propagater.yaml b/tf-a-lts-verified-propagater.yaml
index 40d8a96..7637a6b 100644
--- a/tf-a-lts-verified-propagater.yaml
+++ b/tf-a-lts-verified-propagater.yaml
@@ -3,96 +3,94 @@
     node: docker-amd64-tf-a-jammy
     project-type: freestyle
     concurrent: false
-    description:
-      Triggers whenever a patch in the lts branch get a Verified score.
-      It will vote the same score to the dependent patch
+    description: Triggers whenever a patch in the lts branch get a Verified score. It will vote the same score to the dependent patch
     disabled: false
     builders:
-    - shell: |-
-    - shell: |-
-        #!/bin/bash
-        # This job is triggered by the label Verified +1 or -1 of the patch
-        # it will vote the same score (Verified +1 / Verified -1) to the dependent patch
-        # , if there is any.
-        # For example, P5 -> P4 -> P3 -> P2 -> P1. P5 dependents on P4, and so on
-        # When P5 gets Verified +1, this job will be triggered and set Verified +1 to P4.
-        # P4 gets Verified +1 triggers an other job to set Verified +1 to P3, and so on.
-        # That is how we propagate the Verified score to the entire patch stack
-        set -ex
+      - shell: ""
+      - shell: |-
+          #!/bin/bash
+          # This job is triggered by the label Verified +1 or -1 of the patch
+          # it will vote the same score (Verified +1 / Verified -1) to the dependent patch
+          # , if there is any.
+          # For example, P5 -> P4 -> P3 -> P2 -> P1. P5 dependents on P4, and so on
+          # When P5 gets Verified +1, this job will be triggered and set Verified +1 to P4.
+          # P4 gets Verified +1 triggers an other job to set Verified +1 to P3, and so on.
+          # That is how we propagate the Verified score to the entire patch stack
+          set -ex
 
-        echo "########################################################################"
-        echo "    Gerrit Environment"
-        env |grep '^GERRIT'
-        echo "########################################################################"
+          echo "########################################################################"
+          echo "    Gerrit Environment"
+          env |grep '^GERRIT'
+          echo "########################################################################"
 
-        SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa -p 29418 -i ${CI_BOT_KEY}"
-        GERRIT_URL="review.trustedfirmware.org"
-        GERRIT_QUERY_PARAMS="--dependencies --submit-records --format=JSON change:"
-        QUERY_CMD="${SSH_PARAMS} ${CI_BOT_USERNAME}@${GERRIT_URL} gerrit query ${GERRIT_QUERY_PARAMS}"
-        QUERY_CHANGE_DEPENDS_CMD="${QUERY_CMD}${GERRIT_CHANGE_NUMBER}"
-        REVIEW_MESSAGE="Propagated verified from ${GERRIT_CHANGE_URL}. By ${BUILD_URL}"
-        SET_VERIFIED_CMD="${SSH_PARAMS} ${CI_BOT_USERNAME}@${GERRIT_URL} gerrit review --verified"
+          SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa -p 29418 -i ${CI_BOT_KEY}"
+          GERRIT_URL="review.trustedfirmware.org"
+          GERRIT_QUERY_PARAMS="--dependencies --submit-records --format=JSON change:"
+          QUERY_CMD="${SSH_PARAMS} ${CI_BOT_USERNAME}@${GERRIT_URL} gerrit query ${GERRIT_QUERY_PARAMS}"
+          QUERY_CHANGE_DEPENDS_CMD="${QUERY_CMD}${GERRIT_CHANGE_NUMBER}"
+          REVIEW_MESSAGE="Propagated verified from ${GERRIT_CHANGE_URL}. By ${BUILD_URL}"
+          SET_VERIFIED_CMD="${SSH_PARAMS} ${CI_BOT_USERNAME}@${GERRIT_URL} gerrit review --verified"
 
-        change_url_base=${GERRIT_CHANGE_URL%/*}
-        # Check this example https://ci.trustedfirmware.org/view/TF-A/job/tf-a-lts-verified-propagater/14/console
-        # for what we get from gerrit query command
-        patch_query=$(ssh ${QUERY_CHANGE_DEPENDS_CMD} | jq .)
-        dependsOn=$(echo ${patch_query} | jq -r 'select(.dependsOn)')
-        # Normally, there would be just one dependent patch
-        # (and that patch would in turn has another dependent patch, that's how a dependency chain is structured)
-        # But Gerrit data model has a list of dependent patches, so we process all just in case
-        dependsOn_rev=($(echo ${dependsOn} | jq -r '.dependsOn[].revision'))
-        dependsOn_no=($(echo ${dependsOn} | jq -r '.dependsOn[].number'))
-        verified_status=$(echo ${patch_query} | jq -r 'select(.submitRecords) | .submitRecords[0].labels[] | select(.label == "Verified") | .status')
-        # Verified label status and value mapping
-        # REJECT: -1
-        # OK: 1
-        verified_value=0
-        if [ "${verified_status}" == "REJECT" ]; then
-            verified_value=-1
-        elif [ "${verified_status}" == "OK" ]; then
-            verified_value=1
-        fi
-        # Vote the same Verified score to the dependent patch by loop
-        for ((i=0; i<${#dependsOn_rev[@]}; i++))
-        do
-            # Need to check the .status before set verified score
-            if [ $(ssh ${QUERY_CMD}${dependsOn_no[$i]} | jq -r 'select(.status)|.status') == "MERGED" ]; then
-            	echo "The dependent patch ${change_url_base}${dependsOn_no[$i]} has been merged. Don't set Verified score to it!"
-                continue
-            else
-            	echo "Set Verified ${verified_value} to: ${change_url_base}/${dependsOn_no[$i]}"
-            	ssh ${SET_VERIFIED_CMD} ${verified_value}  -m \'\"${REVIEW_MESSAGE}\"\' ${dependsOn_rev[$i]}
-            fi
-        done
+          change_url_base=${GERRIT_CHANGE_URL%/*}
+          # Check this example https://ci.trustedfirmware.org/view/TF-A/job/tf-a-lts-verified-propagater/14/console
+          # for what we get from gerrit query command
+          patch_query=$(ssh ${QUERY_CHANGE_DEPENDS_CMD} | jq .)
+          dependsOn=$(echo ${patch_query} | jq -r 'select(.dependsOn)')
+          # Normally, there would be just one dependent patch
+          # (and that patch would in turn has another dependent patch, that's how a dependency chain is structured)
+          # But Gerrit data model has a list of dependent patches, so we process all just in case
+          dependsOn_rev=($(echo ${dependsOn} | jq -r '.dependsOn[].revision'))
+          dependsOn_no=($(echo ${dependsOn} | jq -r '.dependsOn[].number'))
+          verified_status=$(echo ${patch_query} | jq -r 'select(.submitRecords) | .submitRecords[0].labels[] | select(.label == "Verified") | .status')
+          # Verified label status and value mapping
+          # REJECT: -1
+          # OK: 1
+          verified_value=0
+          if [ "${verified_status}" == "REJECT" ]; then
+              verified_value=-1
+          elif [ "${verified_status}" == "OK" ]; then
+              verified_value=1
+          fi
+          # Vote the same Verified score to the dependent patch by loop
+          for ((i=0; i<${#dependsOn_rev[@]}; i++))
+          do
+              # Need to check the .status before set verified score
+              if [ $(ssh ${QUERY_CMD}${dependsOn_no[$i]} | jq -r 'select(.status)|.status') == "MERGED" ]; then
+              	echo "The dependent patch ${change_url_base}${dependsOn_no[$i]} has been merged. Don't set Verified score to it!"
+                  continue
+              else
+              	echo "Set Verified ${verified_value} to: ${change_url_base}/${dependsOn_no[$i]}"
+              	ssh ${SET_VERIFIED_CMD} ${verified_value}  -m \'\"${REVIEW_MESSAGE}\"\' ${dependsOn_rev[$i]}
+              fi
+          done
     properties:
-    - build-discarder:
-        days-to-keep: 60
-        num-to-keep: 10
+      - build-discarder:
+          days-to-keep: 60
+          num-to-keep: 10
     triggers:
-    - gerrit:
-        silent: true
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: REG_EXP
-            branch-pattern: 'lts-v.*'
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        trigger-on:
-        - comment-added-event:
-            approval-category: "Verified"
-            approval-value: 1
-        - comment-added-event:
-            approval-category: "Verified"
-            approval-value: -1
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: REG_EXP
+                  branch-pattern: lts-v.*
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+          trigger-on:
+            - comment-added-event:
+                approval-category: Verified
+                approval-value: 1
+            - comment-added-event:
+                approval-category: Verified
+                approval-value: -1
     wrappers:
-    - timestamps
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
+      - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
     publishers:
-    - workspace-cleanup
+      - workspace-cleanup
diff --git a/tf-a-lts2.10-builder.yaml b/tf-a-lts2.10-builder.yaml
index ea44251..a43ff14 100644
--- a/tf-a-lts2.10-builder.yaml
+++ b/tf-a-lts2.10-builder.yaml
@@ -8,141 +8,139 @@
     description: |
       Trusted Firmware A (TF-A) LTS2.10 builder
     properties:
-        - build-discarder:
-            days-to-keep: 15
-            artifact-num-to-keep: 40000
+      - build-discarder:
+          days-to-keep: 15
+          artifact-num-to-keep: 40000
     parameters:
-        - string:
-            name: import_cc
-        - string:
-            name: TEST_CONFIG
-            description: |
-              Original test configuration.
-        - string:
-            name: TEST_DESC
-            description: |
-              Expanded and normalized test configuration, aka "test description"
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: DOCKER_REGISTRY
-            default: ${PRIVATE_CONTAINER_REGISTRY}
-            description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
-        - string:
-            name: JUNO_ROOTFS_URL
-            default: 'http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz'
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'tf'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'tf-a'
-        - string:
-            name: QA_SERVER_VERSION
-            default: ${BUILD_NUMBER}
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_TOOLS_REPO
-            default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-        - string:
-            name: QA_TOOLS_BRANCH
-            default: 'master'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: import_cc
+      - string:
+          name: TEST_CONFIG
+          description: |
+            Original test configuration.
+      - string:
+          name: TEST_DESC
+          description: |
+            Expanded and normalized test configuration, aka "test description"
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: DOCKER_REGISTRY
+          default: ${PRIVATE_CONTAINER_REGISTRY}
+          description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
+      - string:
+          name: JUNO_ROOTFS_URL
+          default: http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: QA_SERVER_TEAM
+          default: tf
+      - string:
+          name: QA_SERVER_PROJECT
+          default: tf-a
+      - string:
+          name: QA_SERVER_VERSION
+          default: ${BUILD_NUMBER}
+      - string:
+          name: QA_SERVER
+          default: https://qa-reports.linaro.org
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 120
-            fail: true
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_USER_TF
-                variable: LAVA_USER
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_TOKEN_TF
-                variable: LAVA_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TUXSUITE_TOKEN
-                variable: TUXSUITE_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: ARMCLANG_UBL_CODE
-                variable: ARMCLANG_UBL_CODE
+      - timestamps
+      - timeout:
+          timeout: 120
+          fail: true
+      - credentials-binding:
+          - text:
+              credential-id: QA_REPORTS_TOKEN
+              variable: QA_REPORTS_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_USER_TF
+              variable: LAVA_USER
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_TOKEN_TF
+              variable: LAVA_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: TUXSUITE_TOKEN
+              variable: TUXSUITE_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: ARMCLANG_UBL_CODE
+              variable: ARMCLANG_UBL_CODE
     builders:
-        - shell: |
-            aarch64-none-elf-gcc -v || true
-        - shell:
-            !include-raw: scripts/clone.sh
-        - shell:
-            !include-raw: tf-a-builder/lts-builders.sh
-        - inject:
-            properties-file: artefacts/env
-        - shell: |
-            ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
-            echo ${BIN_MODE:-release} >lava-binmode.txt
-        - conditional-step:
-            condition-kind: file-exists
-            on-evaluation-failure: dont-run
-            condition-filename: artefacts-lava/job.yaml
-            condition-basedir: workspace
-            steps:
-            - shell:  |
+      - shell: |
+          aarch64-none-elf-gcc -v || true
+      - shell: !include-raw: scripts/clone.sh
+      - shell: !include-raw: tf-a-builder/lts-builders.sh
+      - inject:
+          properties-file: artefacts/env
+      - shell: |
+          ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
+          echo ${BIN_MODE:-release} >lava-binmode.txt
+      - conditional-step:
+          condition-kind: file-exists
+          on-evaluation-failure: dont-run
+          condition-filename: artefacts-lava/job.yaml
+          condition-basedir: workspace
+          steps:
+            - shell: |
                 #!/bin/bash
                 set -e
                 DEVICE_TYPE=fvp
@@ -153,62 +151,61 @@
                 LAVA_SERVER=tf.validation.linaro.org
                 EOF
     publishers:
-        - archive:
-            artifacts: artefacts/**, lava-binmode.txt
-            latest-only: false
-            allow-empty: true
-        - conditional-publisher:
+      - archive:
+          artifacts: artefacts/**, lava-binmode.txt
+          latest-only: false
+          allow-empty: true
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: artefacts-lava/job.yaml
             condition-basedir: workspace
             action:
-                - postbuildscript:
-                    mark-unstable-if-failed: true
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - inject:
-                                properties-file: ${WORKSPACE}/lava.param
-                            - shell: |
-                                #!/bin/bash -x
+              - postbuildscript:
+                  mark-unstable-if-failed: true
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - inject:
+                            properties-file: ${WORKSPACE}/lava.param
+                        - shell: |
+                            #!/bin/bash -x
 
-                                tf-a-job-configs/tf-a-builder/submit-test-job.sh
-                                status=$?
-                                tf-a-job-configs/tf-a-builder/lava-log-process.sh
-                                if [ $status -ne 0 ]; then
-                                    echo "LAVA JOB RESULT: 1"
-                                    exit 1
-                                else
-                                    echo "LAVA JOB RESULT: 0"
-                                fi
-                - postbuildscript:
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - shell: |
-                                #!/bin/bash -e
-                                echo "=== Starting expect-post tests ==="
-                                ./tf-a-ci-scripts/script/expect-post-runner.sh
-        - conditional-publisher:
+                            tf-a-job-configs/tf-a-builder/submit-test-job.sh
+                            status=$?
+                            tf-a-job-configs/tf-a-builder/lava-log-process.sh
+                            if [ $status -ne 0 ]; then
+                                echo "LAVA JOB RESULT: 1"
+                                exit 1
+                            else
+                                echo "LAVA JOB RESULT: 0"
+                            fi
+              - postbuildscript:
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - shell: |
+                            #!/bin/bash -e
+                            echo "=== Starting expect-post tests ==="
+                            ./tf-a-ci-scripts/script/expect-post-runner.sh
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: lava-raw-debug.log
             condition-basedir: workspace
             action:
-                - archive:
-                    artifacts: lava-raw-debug.log
-                    latest-only: false
-                    allow-empty: true
-        - archive:
-            artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
-            latest-only: false
-            allow-empty: true
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-builder/postbuild.groovy
+              - archive:
+                  artifacts: lava-raw-debug.log
+                  latest-only: false
+                  allow-empty: true
+      - archive:
+          artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
+          latest-only: false
+          allow-empty: true
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-builder/postbuild.groovy
diff --git a/tf-a-lts2.10-ci-gateway.yaml b/tf-a-lts2.10-ci-gateway.yaml
index 1d098da..91bd959 100644
--- a/tf-a-lts2.10-ci-gateway.yaml
+++ b/tf-a-lts2.10-ci-gateway.yaml
@@ -8,128 +8,126 @@
     description: |
       Main job entry point for a Trusted Firmware A (TF-A) CI.
     properties:
-    - build-discarder:
-        days-to-keep: 15
-    - throttle:
-        option: project
-        enabled: true
-        max-per-node: 3
-        max-total: 10
+      - build-discarder:
+          days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-per-node: 3
+          max-total: 10
     wrappers:
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
-    - workspace-cleanup
-    - timeout:
-        timeout: 240
-        fail: true
-    - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - workspace-cleanup
+      - timeout:
+          timeout: 240
+          fail: true
+      - timestamps
     parameters:
-    - string:
-        name: TEST_GROUPS
-        default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
-        description: |
-          White space separated list of test configs: can be mix of specific
-          test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
-          group names (e.g., <code>l1 l2</code>).
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        description: |
-          trusted-firmware-a refspec to use. The master branch is used by default.
-    - string:
-        name: TFTF_GERRIT_REFSPEC
-        default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        description: |
-          tf-a-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_TESTS_GERRIT_REFSPEC
-        default: '95d3407a65e26fb3a4319ab38c257e50c9ee804f'
-        description: |
-          tf-m-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_EXTRAS_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-m-extras refspec to use. The master branch is used by default.
-    - string:
-       name: SPM_REFSPEC
-       default: '+refs/heads/master:refs/remotes/origin/master'
-       description: |
-         SPM(Hafnium) refspec to use. The master branch is used by default.
-    - string:
-        name: CI_REFSPEC
-        default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        description: |
-          tf-a-ci-scripts refspec to use. The master branch is used by default.
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
-          tf-a-job-configs refspec to use. The master branch is used by default.
-    - bool:
-        name: ENABLE_STATIC_CHECK
-        default: false
-    - string:
-        name: QA_TOOLS_REPO
-        default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-    - string:
-        name: QA_TOOLS_BRANCH
-        default: 'master'
-    - string:
-        name: USE_TUXSUITE_FVP
-        default: 1
-        description: |
-          Whether to submit FVP tests via TuxSuite (instead of LAVA)
-    - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TEST_GROUPS
+          default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
+          description: |
+            White space separated list of test configs: can be mix of specific
+            test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
+            group names (e.g., <code>l1 l2</code>).
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+          description: |
+            trusted-firmware-a refspec to use. The master branch is used by default.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+          description: |
+            tf-a-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_TESTS_GERRIT_REFSPEC
+          default: 95d3407a65e26fb3a4319ab38c257e50c9ee804f
+          description: |
+            tf-m-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_EXTRAS_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-m-extras refspec to use. The master branch is used by default.
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+          description: |
+            tf-a-ci-scripts refspec to use. The master branch is used by default.
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - bool:
+          name: ENABLE_STATIC_CHECK
+          default: false
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        CI_ROOT=${PWD}/tf-a-ci-scripts
-        export workspace=$PWD
-        export test_groups=$TEST_GROUPS
-        $CI_ROOT/script/gen_test_desc.py
-        cat << EOF > share.param
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - trigger-builds:
-      - project:
-        - tf-a-lts2.10-builder
-        block: true
-        property-file: share.param
-        current-parameters: true
-        property-file-fail-on-missing: false
-        parameter-factories:
-        - factory: filebuild
-          file-pattern: '*.testprop'
-          no-files-found-action: FAIL
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          CI_ROOT=${PWD}/tf-a-ci-scripts
+          export workspace=$PWD
+          export test_groups=$TEST_GROUPS
+          $CI_ROOT/script/gen_test_desc.py
+          cat << EOF > share.param
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - trigger-builds:
+          - project:
+              - tf-a-lts2.10-builder
+            block: true
+            property-file: share.param
+            current-parameters: true
+            property-file-fail-on-missing: false
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: '*.testprop'
+                no-files-found-action: FAIL
     publishers:
-        - postbuildscript:
-            builders:
-                - role: SLAVE
-                  build-on:
-                      - SUCCESS
-                      - FAILURE
-                      - UNSTABLE
-                      - ABORTED
-                      - NOT_BUILT
-                  build-steps:
-                      - shell: |-
-                          #!/bin/bash -e
-                          export CI_ROOT=${PWD}/tf-a-ci-scripts
-                          bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
-        - archive:
-            artifacts: report.json, report.html, merge/outdir/**
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-ci-gateway/postbuild.groovy
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - UNSTABLE
+                - ABORTED
+                - NOT_BUILT
+              build-steps:
+                - shell: |-
+                    #!/bin/bash -e
+                    export CI_ROOT=${PWD}/tf-a-ci-scripts
+                    bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
+      - archive:
+          artifacts: report.json, report.html, merge/outdir/**
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-ci-gateway/postbuild.groovy
diff --git a/tf-a-lts2.10-gerrit-tforg-l1.yaml b/tf-a-lts2.10-gerrit-tforg-l1.yaml
index 0787ca7..3b83f5d 100644
--- a/tf-a-lts2.10-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.10-gerrit-tforg-l1.yaml
@@ -8,150 +8,149 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.10'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: SPM_REFSPEC
+          default: v2.10
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Lint commit messages
-        condition: COMPLETED
-        projects:
-        - name: tf-a-commitlint
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
-            REFSPEC=${GERRIT_REFSPEC}
-            REFNAME=${GERRIT_PATCHSET_REVISION}
-            REFNAME_BASE=origin/${GERRIT_BRANCH}
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tf-l2-scan-build
-            ENABLE_STATIC_CHECK=true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run build tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Lint commit messages
+          condition: COMPLETED
+          projects:
+            - name: tf-a-commitlint
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
+                REFSPEC=${GERRIT_REFSPEC}
+                REFNAME=${GERRIT_PATCHSET_REVISION}
+                REFNAME_BASE=origin/${GERRIT_BRANCH}
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tf-l2-scan-build
+                ENABLE_STATIC_CHECK=true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run build tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-        - project-compare-type: PLAIN
-          project-pattern: TF-A/trusted-firmware-a
-          branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: lts-v2.10
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.10
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.10-gerrit-tforg-l2.yaml b/tf-a-lts2.10-gerrit-tforg-l2.yaml
index 9322051..43702a8 100644
--- a/tf-a-lts2.10-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.10-gerrit-tforg-l2.yaml
@@ -8,187 +8,185 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.10'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: SPM_REFSPEC
+          default: v2.10
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build Trusted Firmware
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run platform boot tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-boot-tests-arm-plats tf-l2-boot-tests-partner-boards
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: TFTF tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Boot up to the Linux shell prompt
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - conditional-step:
-        condition-command: |-
-          [ "$NOMINATION_FILE" ]
-        condition-kind: shell
-        on-evaluation-failure: dont-run
-        steps:
-        - multijob:
-            condition: COMPLETED
-            name: Nominated tests
-            projects:
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build Trusted Firmware
+          projects:
             - kill-phase-on: NEVER
               name: tf-a-lts2.10-ci-gateway
               current-parameters: true
               predefined-parameters: |
-                TEST_GROUPS=@$NOMINATION_FILE
+                TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
                 TF_REFSPEC=$GERRIT_REFSPEC
               property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run platform boot tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              predefined-parameters: |
+                TEST_GROUPS=tf-l2-boot-tests-arm-plats tf-l2-boot-tests-partner-boards
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: TFTF tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Boot up to the Linux shell prompt
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - conditional-step:
+          condition-command: '[ "$NOMINATION_FILE" ]'
+          condition-kind: shell
+          on-evaluation-failure: dont-run
+          steps:
+            - multijob:
+                condition: COMPLETED
+                name: Nominated tests
+                projects:
+                  - kill-phase-on: NEVER
+                    name: tf-a-lts2.10-ci-gateway
+                    current-parameters: true
+                    predefined-parameters: |
+                      TEST_GROUPS=@$NOMINATION_FILE
+                      TF_REFSPEC=$GERRIT_REFSPEC
+                    property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/trusted-firmware-a
-            branches:
-              - branch-compare-type: PLAIN
-                branch-pattern: lts-v2.10
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        failure-message: 'OpenCI: build failed'
-        successful-message: 'OpenCI: build successful'
-        unstable-message: 'OpenCI: build unstable'
-        notbuilt-message: 'OpenCI: no builds executed'
-        silent: false
-        silent-start: false
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.10
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          failure-message: 'OpenCI: build failed'
+          successful-message: 'OpenCI: build successful'
+          unstable-message: 'OpenCI: build unstable'
+          notbuilt-message: 'OpenCI: no builds executed'
+          silent: false
+          silent-start: false
diff --git a/tf-a-lts2.10-main.yaml b/tf-a-lts2.10-main.yaml
index 534e173..1c031e2 100644
--- a/tf-a-lts2.10-main.yaml
+++ b/tf-a-lts2.10-main.yaml
@@ -16,48 +16,48 @@
     parameters:
       - string:
           name: TF_GERRIT_PROJECT
-          default: 'TF-A/trusted-firmware-a'
+          default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: 'refs/heads/lts-v2.10'
+          default: refs/heads/lts-v2.10
       - string:
           name: TF_GERRIT_REFSPEC
-          default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
       - string:
           name: TFTF_GERRIT_PROJECT
-          default: 'TF-A/tf-a-tests'
+          default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 'refs/heads/lts-v2.10'
+          default: refs/heads/lts-v2.10
       - string:
           name: TFTF_GERRIT_REFSPEC
-          default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
       - string:
           name: TF_M_TESTS_GERRIT_REFSPEC
-          default: '95d3407a65e26fb3a4319ab38c257e50c9ee804f'
+          default: 95d3407a65e26fb3a4319ab38c257e50c9ee804f
           description: |
             tf-m-tests refspec to use. The master branch is used by default.
       - string:
           name: TF_M_EXTRAS_GERRIT_REFSPEC
-          default: '+refs/heads/master:refs/remotes/origin/master'
+          default: +refs/heads/master:refs/remotes/origin/master
           description: |
             tf-m-extras refspec to use. The master branch is used by default.
       - string:
-         name: SPM_REFSPEC
-         default: 'v2.10'
-         description: |
-           SPM(Hafnium) refspec to use. The master branch is used by default.
+          name: SPM_REFSPEC
+          default: v2.10
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
       - string:
           name: CI_REFSPEC
-          default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
       - string:
           name: JOBS_REFSPEC
-          default: 'refs/heads/master'
+          default: refs/heads/master
           description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
       - string:
           name: MBEDTLS_URL
-          default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
       - bool:
           name: FORCE_TO_BUILD
           default: false
@@ -76,22 +76,21 @@
             Whether to submit FVP tests via TuxSuite (instead of LAVA)
       - string:
           name: SHARE_FOLDER
-          default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-          description: 'Folder containing shared repositories for downstream pipeline jobs'
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     triggers:
-      - timed: 'H H(0-7) * * 1,3,5'
+      - timed: H H(0-7) * * 1,3,5
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-      - shell:
-          !include-raw: scripts/clone.sh
+      - shell: !include-raw: scripts/clone.sh
       - shell: |
           #!/bin/bash
           set -e
@@ -111,8 +110,7 @@
           QA_SERVER_VERSION=${BUILD_NUMBER}
           SHARE_FOLDER=${SHARE_FOLDER}
           EOF
-      - shell:
-          !include-raw: scripts/lts-check-last-commit.sh
+      - shell: !include-raw: scripts/lts-check-last-commit.sh
       - conditional-step:
           condition-kind: file-exists
           condition-filename: TO_BUILD
@@ -122,215 +120,215 @@
                 name: Run static checks on the code
                 condition: COMPLETED
                 projects:
-                - name: tf-a-static-checks
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  property-file: tf-a-env.param
+                  - name: tf-a-static-checks
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    property-file: tf-a-env.param
             - multijob:
                 name: Build Trusted Firmware
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l1-build-fvp tf-l2-build-fvp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: |
-                    TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l1-build-juno tf-l2-build-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l1-build-plat
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-plat
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l1-build-clang
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-clang
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l1-build-fvp tf-l2-build-fvp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: |
+                      TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l1-build-juno tf-l2-build-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l1-build-plat
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-plat
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l1-build-clang
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-clang
+                    property-file: tf-a-env.param
             - multijob:
                 name: TFTF Tests for FVP
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tftf-l2-fwu
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-fwu
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tftf-l2-extensive-tests-fvp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
-                  property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tftf-l2-fwu
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-fwu
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tftf-l2-extensive-tests-fvp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
+                    property-file: tf-a-tests-env.param
             - multijob:
                 name: Boot up to the Linux shell prompt
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-aarch32
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-rootfs
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-spm-mm
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: spm-l2-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-aarch32
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-rootfs
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-spm-mm
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: spm-l2-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
+                    property-file: tf-a-env.param
             - multijob:
                 name: Boot up to the Linux shell prompt - Part 2
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-misc
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-latest
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-cortex
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-gicv2
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-bl2_el3
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: qemu-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=qemu-boot-tests
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-misc
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-latest
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-cortex
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-gicv2
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-bl2_el3
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: qemu-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=qemu-boot-tests
+                    property-file: tf-a-env.param
             - multijob:
                 name: Juno Boot Tests
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tftf-l1-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l1-juno
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tftf-l1-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l1-juno
+                    property-file: tf-a-env.param
             - multijob:
                 name: Miscellaneous tests
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l3-boot-tests-css
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l3-boot-tests-spm-mm
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l3-boot-tests-ras
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l3-boot-tests-misc
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l3-boot-tests-n1sdp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-n1sdp
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: spm-l3-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-partner-boards
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-partner-boards
-                  property-file: tf-a-env.param
-                # Platform-specific self-tests.
-                # These tests run from the BL31 image then halt the target.
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l2-boot-tests-arm-plats
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-arm-plats
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l3-boot-tests-css
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l3-boot-tests-spm-mm
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l3-boot-tests-ras
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l3-boot-tests-misc
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l3-boot-tests-n1sdp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-n1sdp
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: spm-l3-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-partner-boards
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-partner-boards
+                    property-file: tf-a-env.param
+                  # Platform-specific self-tests.
+                  # These tests run from the BL31 image then halt the target.
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l2-boot-tests-arm-plats
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-arm-plats
+                    property-file: tf-a-env.param
             - multijob:
                 name: Run doc build check
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.10-ci-gateway
-                  alias: tf-l1-check-docs
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-check-docs
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.10-ci-gateway
+                    alias: tf-l1-check-docs
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-check-docs
+                    property-file: tf-a-env.param
             - multijob:
                 name: Generate visualizations
                 condition: COMPLETED
@@ -371,6 +369,6 @@
                   script: |
                     def currentBuild = Thread.currentThread().executable
                     currentBuild.setDescription("There are no new commits in the repositories, skip the build!")
-                  on-failure: "nothing"
+                  on-failure: nothing
       - email:
           recipients: bipin.ravi@arm.com, vwadekar@nvidia.com, yann.gautier@st.com, jidong@google.com, govindraj.raja@arm.com
diff --git a/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml b/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml
index 439ff6a..57c64ff 100644
--- a/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml
@@ -8,147 +8,145 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.10'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/main'
-            description: |
-              tf-a-job-configs refspec to use. The main branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: v2.10
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/main
+          description: |
+            tf-a-job-configs refspec to use. The main branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            REPO_UNDER_TEST=tf-a-tests
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-build
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Basic TF-A-Tests test cases
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: REPO_UNDER_TEST=tf-a-tests
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-build
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Basic TF-A-Tests test cases
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/tf-a-tests
-            branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: lts-v2.10
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.10
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml b/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml
index 89427a0..e8540b2 100644
--- a/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml
@@ -8,148 +8,147 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.10'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.10'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.10
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: v2.10
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-tftf-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Firmware Update Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fwu
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Level 2 testing of TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run extensive TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.10-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-extensive-tests-fvp
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-tftf-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Firmware Update Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fwu
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Level 2 testing of TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run extensive TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.10-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-extensive-tests-fvp
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: lts-v2.10
-          project-compare-type: PLAIN
-          project-pattern: TF-A/tf-a-tests
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.10
+              project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.12-builder.yaml b/tf-a-lts2.12-builder.yaml
index 89aef43..61cb8bd 100644
--- a/tf-a-lts2.12-builder.yaml
+++ b/tf-a-lts2.12-builder.yaml
@@ -8,141 +8,139 @@
     description: |
       Trusted Firmware A (TF-A) LTS2.12 builder
     properties:
-        - build-discarder:
-            days-to-keep: 15
-            artifact-num-to-keep: 40000
+      - build-discarder:
+          days-to-keep: 15
+          artifact-num-to-keep: 40000
     parameters:
-        - string:
-            name: import_cc
-        - string:
-            name: TEST_CONFIG
-            description: |
-              Original test configuration.
-        - string:
-            name: TEST_DESC
-            description: |
-              Expanded and normalized test configuration, aka "test description"
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: DOCKER_REGISTRY
-            default: ${PRIVATE_CONTAINER_REGISTRY}
-            description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
-        - string:
-            name: JUNO_ROOTFS_URL
-            default: 'http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz'
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'tf'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'tf-a'
-        - string:
-            name: QA_SERVER_VERSION
-            default: ${BUILD_NUMBER}
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_TOOLS_REPO
-            default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-        - string:
-            name: QA_TOOLS_BRANCH
-            default: 'master'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: import_cc
+      - string:
+          name: TEST_CONFIG
+          description: |
+            Original test configuration.
+      - string:
+          name: TEST_DESC
+          description: |
+            Expanded and normalized test configuration, aka "test description"
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: DOCKER_REGISTRY
+          default: ${PRIVATE_CONTAINER_REGISTRY}
+          description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
+      - string:
+          name: JUNO_ROOTFS_URL
+          default: http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: QA_SERVER_TEAM
+          default: tf
+      - string:
+          name: QA_SERVER_PROJECT
+          default: tf-a
+      - string:
+          name: QA_SERVER_VERSION
+          default: ${BUILD_NUMBER}
+      - string:
+          name: QA_SERVER
+          default: https://qa-reports.linaro.org
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 120
-            fail: true
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_USER_TF
-                variable: LAVA_USER
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_TOKEN_TF
-                variable: LAVA_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TUXSUITE_TOKEN
-                variable: TUXSUITE_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: ARMCLANG_UBL_CODE
-                variable: ARMCLANG_UBL_CODE
+      - timestamps
+      - timeout:
+          timeout: 120
+          fail: true
+      - credentials-binding:
+          - text:
+              credential-id: QA_REPORTS_TOKEN
+              variable: QA_REPORTS_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_USER_TF
+              variable: LAVA_USER
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_TOKEN_TF
+              variable: LAVA_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: TUXSUITE_TOKEN
+              variable: TUXSUITE_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: ARMCLANG_UBL_CODE
+              variable: ARMCLANG_UBL_CODE
     builders:
-        - shell: |
-            aarch64-none-elf-gcc -v || true
-        - shell:
-            !include-raw: scripts/clone.sh
-        - shell:
-            !include-raw: tf-a-builder/lts-builders.sh
-        - inject:
-            properties-file: artefacts/env
-        - shell: |
-            ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
-            echo ${BIN_MODE:-release} >lava-binmode.txt
-        - conditional-step:
-            condition-kind: file-exists
-            on-evaluation-failure: dont-run
-            condition-filename: artefacts-lava/job.yaml
-            condition-basedir: workspace
-            steps:
-            - shell:  |
+      - shell: |
+          aarch64-none-elf-gcc -v || true
+      - shell: !include-raw: scripts/clone.sh
+      - shell: !include-raw: tf-a-builder/lts-builders.sh
+      - inject:
+          properties-file: artefacts/env
+      - shell: |
+          ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
+          echo ${BIN_MODE:-release} >lava-binmode.txt
+      - conditional-step:
+          condition-kind: file-exists
+          on-evaluation-failure: dont-run
+          condition-filename: artefacts-lava/job.yaml
+          condition-basedir: workspace
+          steps:
+            - shell: |
                 #!/bin/bash
                 set -e
                 DEVICE_TYPE=fvp
@@ -153,62 +151,61 @@
                 LAVA_SERVER=tf.validation.linaro.org
                 EOF
     publishers:
-        - archive:
-            artifacts: artefacts/**, lava-binmode.txt
-            latest-only: false
-            allow-empty: true
-        - conditional-publisher:
+      - archive:
+          artifacts: artefacts/**, lava-binmode.txt
+          latest-only: false
+          allow-empty: true
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: artefacts-lava/job.yaml
             condition-basedir: workspace
             action:
-                - postbuildscript:
-                    mark-unstable-if-failed: true
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - inject:
-                                properties-file: ${WORKSPACE}/lava.param
-                            - shell: |
-                                #!/bin/bash -x
+              - postbuildscript:
+                  mark-unstable-if-failed: true
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - inject:
+                            properties-file: ${WORKSPACE}/lava.param
+                        - shell: |
+                            #!/bin/bash -x
 
-                                tf-a-job-configs/tf-a-builder/submit-test-job.sh
-                                status=$?
-                                tf-a-job-configs/tf-a-builder/lava-log-process.sh
-                                if [ $status -ne 0 ]; then
-                                    echo "LAVA JOB RESULT: 1"
-                                    exit 1
-                                else
-                                    echo "LAVA JOB RESULT: 0"
-                                fi
-                - postbuildscript:
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - shell: |
-                                #!/bin/bash -e
-                                echo "=== Starting expect-post tests ==="
-                                ./tf-a-ci-scripts/script/expect-post-runner.sh
-        - conditional-publisher:
+                            tf-a-job-configs/tf-a-builder/submit-test-job.sh
+                            status=$?
+                            tf-a-job-configs/tf-a-builder/lava-log-process.sh
+                            if [ $status -ne 0 ]; then
+                                echo "LAVA JOB RESULT: 1"
+                                exit 1
+                            else
+                                echo "LAVA JOB RESULT: 0"
+                            fi
+              - postbuildscript:
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - shell: |
+                            #!/bin/bash -e
+                            echo "=== Starting expect-post tests ==="
+                            ./tf-a-ci-scripts/script/expect-post-runner.sh
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: lava-raw-debug.log
             condition-basedir: workspace
             action:
-                - archive:
-                    artifacts: lava-raw-debug.log
-                    latest-only: false
-                    allow-empty: true
-        - archive:
-            artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
-            latest-only: false
-            allow-empty: true
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-builder/postbuild.groovy
+              - archive:
+                  artifacts: lava-raw-debug.log
+                  latest-only: false
+                  allow-empty: true
+      - archive:
+          artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
+          latest-only: false
+          allow-empty: true
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-builder/postbuild.groovy
diff --git a/tf-a-lts2.12-ci-gateway.yaml b/tf-a-lts2.12-ci-gateway.yaml
index 9cf322c..8918c9a 100644
--- a/tf-a-lts2.12-ci-gateway.yaml
+++ b/tf-a-lts2.12-ci-gateway.yaml
@@ -8,128 +8,126 @@
     description: |
       Main job entry point for a Trusted Firmware A (TF-A) LTS v2.12 CI.
     properties:
-    - build-discarder:
-        days-to-keep: 15
-    - throttle:
-        option: project
-        enabled: true
-        max-per-node: 3
-        max-total: 10
+      - build-discarder:
+          days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-per-node: 3
+          max-total: 10
     wrappers:
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
-    - workspace-cleanup
-    - timeout:
-        timeout: 240
-        fail: true
-    - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - workspace-cleanup
+      - timeout:
+          timeout: 240
+          fail: true
+      - timestamps
     parameters:
-    - string:
-        name: TEST_GROUPS
-        default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
-        description: |
-          White space separated list of test configs: can be mix of specific
-          test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
-          group names (e.g., <code>l1 l2</code>).
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        description: |
-          trusted-firmware-a refspec to use. The lts-v2.12 branch is used by default.
-    - string:
-        name: TFTF_GERRIT_REFSPEC
-        default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        description: |
-          tf-a-tests refspec to use. The lts-v2.12 branch is used by default.
-    - string:
-        name: TF_M_TESTS_GERRIT_REFSPEC
-        default: '53ddc58dcd57e1f5cf658b316d7d735335d58570'
-        description: |
-          tf-m-tests refspec to use. The tfa_ci_dep_revision branch is used by default.
-    - string:
-        name: TF_M_EXTRAS_GERRIT_REFSPEC
-        default: '3ff04e40ff7f66c8cee087b6e5cbd8fb8c1bec01'
-        description: |
-          tf-m-extras refspec to use. The tfa_ci_dep_revision branch is used by default.
-    - string:
-       name: SPM_REFSPEC
-       default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-       description: |
-         SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
-    - string:
-        name: CI_REFSPEC
-        default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        description: |
-          tf-a-ci-scripts refspec to use. The lts-v2.12 branch is used by default.
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
-          tf-a-job-configs refspec to use. The master branch is used by default.
-    - bool:
-        name: ENABLE_STATIC_CHECK
-        default: false
-    - string:
-        name: QA_TOOLS_REPO
-        default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-    - string:
-        name: QA_TOOLS_BRANCH
-        default: 'master'
-    - string:
-        name: USE_TUXSUITE_FVP
-        default: 1
-        description: |
-          Whether to submit FVP tests via TuxSuite (instead of LAVA)
-    - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TEST_GROUPS
+          default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
+          description: |
+            White space separated list of test configs: can be mix of specific
+            test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
+            group names (e.g., <code>l1 l2</code>).
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+          description: |
+            trusted-firmware-a refspec to use. The lts-v2.12 branch is used by default.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+          description: |
+            tf-a-tests refspec to use. The lts-v2.12 branch is used by default.
+      - string:
+          name: TF_M_TESTS_GERRIT_REFSPEC
+          default: 53ddc58dcd57e1f5cf658b316d7d735335d58570
+          description: |
+            tf-m-tests refspec to use. The tfa_ci_dep_revision branch is used by default.
+      - string:
+          name: TF_M_EXTRAS_GERRIT_REFSPEC
+          default: 3ff04e40ff7f66c8cee087b6e5cbd8fb8c1bec01
+          description: |
+            tf-m-extras refspec to use. The tfa_ci_dep_revision branch is used by default.
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+          description: |
+            SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+          description: |
+            tf-a-ci-scripts refspec to use. The lts-v2.12 branch is used by default.
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - bool:
+          name: ENABLE_STATIC_CHECK
+          default: false
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        CI_ROOT=${PWD}/tf-a-ci-scripts
-        export workspace=$PWD
-        export test_groups=$TEST_GROUPS
-        $CI_ROOT/script/gen_test_desc.py
-        cat << EOF > share.param
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - trigger-builds:
-      - project:
-        - tf-a-lts2.12-builder
-        block: true
-        property-file: share.param
-        current-parameters: true
-        property-file-fail-on-missing: false
-        parameter-factories:
-        - factory: filebuild
-          file-pattern: '*.testprop'
-          no-files-found-action: FAIL
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          CI_ROOT=${PWD}/tf-a-ci-scripts
+          export workspace=$PWD
+          export test_groups=$TEST_GROUPS
+          $CI_ROOT/script/gen_test_desc.py
+          cat << EOF > share.param
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - trigger-builds:
+          - project:
+              - tf-a-lts2.12-builder
+            block: true
+            property-file: share.param
+            current-parameters: true
+            property-file-fail-on-missing: false
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: '*.testprop'
+                no-files-found-action: FAIL
     publishers:
-        - postbuildscript:
-            builders:
-                - role: SLAVE
-                  build-on:
-                      - SUCCESS
-                      - FAILURE
-                      - UNSTABLE
-                      - ABORTED
-                      - NOT_BUILT
-                  build-steps:
-                      - shell: |-
-                          #!/bin/bash -e
-                          export CI_ROOT=${PWD}/tf-a-ci-scripts
-                          bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
-        - archive:
-            artifacts: report.json, report.html, merge/outdir/**
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-ci-gateway/postbuild.groovy
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - UNSTABLE
+                - ABORTED
+                - NOT_BUILT
+              build-steps:
+                - shell: |-
+                    #!/bin/bash -e
+                    export CI_ROOT=${PWD}/tf-a-ci-scripts
+                    bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
+      - archive:
+          artifacts: report.json, report.html, merge/outdir/**
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-ci-gateway/postbuild.groovy
diff --git a/tf-a-lts2.12-gerrit-tforg-l1.yaml b/tf-a-lts2.12-gerrit-tforg-l1.yaml
index 2f66018..56c4207 100644
--- a/tf-a-lts2.12-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.12-gerrit-tforg-l1.yaml
@@ -8,150 +8,149 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-           name: SPM_REFSPEC
-           default: 'lts-v2.12'
-           description: |
-             SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: SPM_REFSPEC
+          default: lts-v2.12
+          description: |
+            SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Lint commit messages
-        condition: COMPLETED
-        projects:
-        - name: tf-a-commitlint
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
-            REFSPEC=${GERRIT_REFSPEC}
-            REFNAME=${GERRIT_PATCHSET_REVISION}
-            REFNAME_BASE=origin/${GERRIT_BRANCH}
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tf-l2-scan-build
-            ENABLE_STATIC_CHECK=true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run build tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Lint commit messages
+          condition: COMPLETED
+          projects:
+            - name: tf-a-commitlint
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
+                REFSPEC=${GERRIT_REFSPEC}
+                REFNAME=${GERRIT_PATCHSET_REVISION}
+                REFNAME_BASE=origin/${GERRIT_BRANCH}
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tf-l2-scan-build
+                ENABLE_STATIC_CHECK=true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run build tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-        - project-compare-type: PLAIN
-          project-pattern: TF-A/trusted-firmware-a
-          branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: lts-v2.12
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.12
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.12-gerrit-tforg-l2.yaml b/tf-a-lts2.12-gerrit-tforg-l2.yaml
index 98fa26a..b0addd6 100644
--- a/tf-a-lts2.12-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.12-gerrit-tforg-l2.yaml
@@ -8,187 +8,185 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-           name: SPM_REFSPEC
-           default: 'lts-v2.12'
-           description: |
-             SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: SPM_REFSPEC
+          default: lts-v2.12
+          description: |
+            SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build Trusted Firmware
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run platform boot tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-boot-tests-arm-plats tf-l2-boot-tests-partner-boards
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: TFTF tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Boot up to the Linux shell prompt
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - conditional-step:
-        condition-command: |-
-          [ "$NOMINATION_FILE" ]
-        condition-kind: shell
-        on-evaluation-failure: dont-run
-        steps:
-        - multijob:
-            condition: COMPLETED
-            name: Nominated tests
-            projects:
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build Trusted Firmware
+          projects:
             - kill-phase-on: NEVER
               name: tf-a-lts2.12-ci-gateway
               current-parameters: true
               predefined-parameters: |
-                TEST_GROUPS=@$NOMINATION_FILE
+                TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
                 TF_REFSPEC=$GERRIT_REFSPEC
               property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run platform boot tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              predefined-parameters: |
+                TEST_GROUPS=tf-l2-boot-tests-arm-plats tf-l2-boot-tests-partner-boards
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: TFTF tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Boot up to the Linux shell prompt
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - conditional-step:
+          condition-command: '[ "$NOMINATION_FILE" ]'
+          condition-kind: shell
+          on-evaluation-failure: dont-run
+          steps:
+            - multijob:
+                condition: COMPLETED
+                name: Nominated tests
+                projects:
+                  - kill-phase-on: NEVER
+                    name: tf-a-lts2.12-ci-gateway
+                    current-parameters: true
+                    predefined-parameters: |
+                      TEST_GROUPS=@$NOMINATION_FILE
+                      TF_REFSPEC=$GERRIT_REFSPEC
+                    property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/trusted-firmware-a
-            branches:
-              - branch-compare-type: PLAIN
-                branch-pattern: lts-v2.12
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        failure-message: 'OpenCI: build failed'
-        successful-message: 'OpenCI: build successful'
-        unstable-message: 'OpenCI: build unstable'
-        notbuilt-message: 'OpenCI: no builds executed'
-        silent: false
-        silent-start: false
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.12
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          failure-message: 'OpenCI: build failed'
+          successful-message: 'OpenCI: build successful'
+          unstable-message: 'OpenCI: build unstable'
+          notbuilt-message: 'OpenCI: no builds executed'
+          silent: false
+          silent-start: false
diff --git a/tf-a-lts2.12-main.yaml b/tf-a-lts2.12-main.yaml
index cdbfe93..bef17fd 100644
--- a/tf-a-lts2.12-main.yaml
+++ b/tf-a-lts2.12-main.yaml
@@ -16,48 +16,48 @@
     parameters:
       - string:
           name: TF_GERRIT_PROJECT
-          default: 'TF-A/trusted-firmware-a'
+          default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: 'refs/heads/lts-v2.12'
+          default: refs/heads/lts-v2.12
       - string:
           name: TF_GERRIT_REFSPEC
-          default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
       - string:
           name: TFTF_GERRIT_PROJECT
-          default: 'TF-A/tf-a-tests'
+          default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 'refs/heads/lts-v2.12'
+          default: refs/heads/lts-v2.12
       - string:
           name: TFTF_GERRIT_REFSPEC
-          default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
       - string:
           name: TF_M_TESTS_GERRIT_REFSPEC
-          default: '53ddc58dcd57e1f5cf658b316d7d735335d58570'
+          default: 53ddc58dcd57e1f5cf658b316d7d735335d58570
           description: |
             tf-m-tests refspec to use. The tfa_ci_dep_revision branch is used by default.
       - string:
           name: TF_M_EXTRAS_GERRIT_REFSPEC
-          default: '3ff04e40ff7f66c8cee087b6e5cbd8fb8c1bec01'
+          default: 3ff04e40ff7f66c8cee087b6e5cbd8fb8c1bec01
           description: |
             tf-m-extras refspec to use. The tfs_ci_dep_revision branch is used by default.
       - string:
-         name: SPM_REFSPEC
-         default: 'lts-v2.12'
-         description: |
-           SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
+          name: SPM_REFSPEC
+          default: lts-v2.12
+          description: |
+            SPM(Hafnium) refspec to use. The lts-v2.12 branch is used by default.
       - string:
           name: CI_REFSPEC
-          default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
       - string:
           name: JOBS_REFSPEC
-          default: 'refs/heads/master'
+          default: refs/heads/master
           description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
       - string:
           name: MBEDTLS_URL
-          default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
       - bool:
           name: FORCE_TO_BUILD
           default: false
@@ -76,22 +76,21 @@
             Whether to submit FVP tests via TuxSuite (instead of LAVA)
       - string:
           name: SHARE_FOLDER
-          default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-          description: 'Folder containing shared repositories for downstream pipeline jobs'
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     triggers:
-      - timed: 'H H(0-7) * * 1,3,5'
+      - timed: H H(0-7) * * 1,3,5
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-      - shell:
-          !include-raw: scripts/clone.sh
+      - shell: !include-raw: scripts/clone.sh
       - shell: |
           #!/bin/bash
           set -e
@@ -111,8 +110,7 @@
           QA_SERVER_VERSION=${BUILD_NUMBER}
           SHARE_FOLDER=${SHARE_FOLDER}
           EOF
-      - shell:
-          !include-raw: scripts/lts-check-last-commit.sh
+      - shell: !include-raw: scripts/lts-check-last-commit.sh
       - conditional-step:
           condition-kind: file-exists
           condition-filename: TO_BUILD
@@ -122,215 +120,215 @@
                 name: Run static checks on the code
                 condition: COMPLETED
                 projects:
-                - name: tf-a-static-checks
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  property-file: tf-a-env.param
+                  - name: tf-a-static-checks
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    property-file: tf-a-env.param
             - multijob:
                 name: Build Trusted Firmware
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l1-build-fvp tf-l2-build-fvp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: |
-                    TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l1-build-juno tf-l2-build-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l1-build-plat
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-plat
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l1-build-clang
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-clang
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l1-build-fvp tf-l2-build-fvp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: |
+                      TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l1-build-juno tf-l2-build-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l1-build-plat
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-plat
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l1-build-clang
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-clang
+                    property-file: tf-a-env.param
             - multijob:
                 name: TFTF Tests for FVP
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tftf-l2-fwu
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-fwu
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tftf-l2-extensive-tests-fvp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
-                  property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tftf-l2-fwu
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-fwu
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tftf-l2-extensive-tests-fvp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
+                    property-file: tf-a-tests-env.param
             - multijob:
                 name: Boot up to the Linux shell prompt
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-aarch32
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-rootfs
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-spm-mm
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: spm-l2-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-aarch32
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-rootfs
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-spm-mm
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: spm-l2-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
+                    property-file: tf-a-env.param
             - multijob:
                 name: Boot up to the Linux shell prompt - Part 2
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-misc
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-latest
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-cortex
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-gicv2
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-bl2_el3
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: qemu-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=qemu-boot-tests
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-misc
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-latest
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-cortex
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-gicv2
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-bl2_el3
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: qemu-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=qemu-boot-tests
+                    property-file: tf-a-env.param
             - multijob:
                 name: Juno Boot Tests
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tftf-l1-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l1-juno
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tftf-l1-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l1-juno
+                    property-file: tf-a-env.param
             - multijob:
                 name: Miscellaneous tests
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l3-boot-tests-css
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l3-boot-tests-spm-mm
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l3-boot-tests-ras
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l3-boot-tests-misc
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l3-boot-tests-n1sdp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-n1sdp
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: spm-l3-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-partner-boards
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-partner-boards
-                  property-file: tf-a-env.param
-                # Platform-specific self-tests.
-                # These tests run from the BL31 image then halt the target.
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l2-boot-tests-arm-plats
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-arm-plats
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l3-boot-tests-css
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l3-boot-tests-spm-mm
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l3-boot-tests-ras
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l3-boot-tests-misc
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l3-boot-tests-n1sdp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-n1sdp
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: spm-l3-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-partner-boards
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-partner-boards
+                    property-file: tf-a-env.param
+                  # Platform-specific self-tests.
+                  # These tests run from the BL31 image then halt the target.
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l2-boot-tests-arm-plats
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-arm-plats
+                    property-file: tf-a-env.param
             - multijob:
                 name: Run doc build check
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.12-ci-gateway
-                  alias: tf-l1-check-docs
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-check-docs
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.12-ci-gateway
+                    alias: tf-l1-check-docs
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-check-docs
+                    property-file: tf-a-env.param
             - multijob:
                 name: Generate visualizations
                 condition: COMPLETED
@@ -371,6 +369,6 @@
                   script: |
                     def currentBuild = Thread.currentThread().executable
                     currentBuild.setDescription("There are no new commits in the repositories, skip the build!")
-                  on-failure: "nothing"
+                  on-failure: nothing
       - email:
           recipients: bipin.ravi@arm.com, vwadekar@nvidia.com, yann.gautier@st.com, jidong@google.com, govindraj.raja@arm.com
diff --git a/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml b/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
index 91745db..82365c5 100644
--- a/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
@@ -8,147 +8,145 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: 'lts-v2.12'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: lts-v2.12
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            REPO_UNDER_TEST=tf-a-tests
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-build
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Basic TF-A-Tests test cases
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: REPO_UNDER_TEST=tf-a-tests
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-build
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Basic TF-A-Tests test cases
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/tf-a-tests
-            branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: lts-v2.12
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.12
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml b/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml
index 9e23038..ed4de39 100644
--- a/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml
@@ -8,148 +8,147 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.12'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: 'lts-v2.12'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.12
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: lts-v2.12
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-tftf-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Firmware Update Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fwu
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Level 2 testing of TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run extensive TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.12-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-extensive-tests-fvp
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-tftf-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Firmware Update Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fwu
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Level 2 testing of TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run extensive TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.12-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-extensive-tests-fvp
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: lts-v2.12
-          project-compare-type: PLAIN
-          project-pattern: TF-A/tf-a-tests
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.12
+              project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.8-builder.yaml b/tf-a-lts2.8-builder.yaml
index db496d6..a2a49c2 100644
--- a/tf-a-lts2.8-builder.yaml
+++ b/tf-a-lts2.8-builder.yaml
@@ -8,141 +8,139 @@
     description: |
       Trusted Firmware A (TF-A) LTS2.8 builder
     properties:
-        - build-discarder:
-            days-to-keep: 15
-            artifact-num-to-keep: 40000
+      - build-discarder:
+          days-to-keep: 15
+          artifact-num-to-keep: 40000
     parameters:
-        - string:
-            name: import_cc
-        - string:
-            name: TEST_CONFIG
-            description: |
-              Original test configuration.
-        - string:
-            name: TEST_DESC
-            description: |
-              Expanded and normalized test configuration, aka "test description"
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: DOCKER_REGISTRY
-            default: ${PRIVATE_CONTAINER_REGISTRY}
-            description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
-        - string:
-            name: JUNO_ROOTFS_URL
-            default: 'http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz'
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_HOST
-            default: 'review.trustedfirmware.org'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'tf'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'tf-a'
-        - string:
-            name: QA_SERVER_VERSION
-            default: ${BUILD_NUMBER}
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_TOOLS_REPO
-            default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-        - string:
-            name: QA_TOOLS_BRANCH
-            default: 'master'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: import_cc
+      - string:
+          name: TEST_CONFIG
+          description: |
+            Original test configuration.
+      - string:
+          name: TEST_DESC
+          description: |
+            Expanded and normalized test configuration, aka "test description"
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: DOCKER_REGISTRY
+          default: ${PRIVATE_CONTAINER_REGISTRY}
+          description: PRIVATE_CONTAINER_REGISTRY is a system-wide environment variable
+      - string:
+          name: JUNO_ROOTFS_URL
+          default: http://releases.linaro.org/openembedded/aarch64/17.01/linaro-image-minimal-genericarmv8-20170127-888.rootfs.tar.gz
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_HOST
+          default: review.trustedfirmware.org
+      - string:
+          name: QA_SERVER_TEAM
+          default: tf
+      - string:
+          name: QA_SERVER_PROJECT
+          default: tf-a
+      - string:
+          name: QA_SERVER_VERSION
+          default: ${BUILD_NUMBER}
+      - string:
+          name: QA_SERVER
+          default: https://qa-reports.linaro.org
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 120
-            fail: true
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_USER_TF
-                variable: LAVA_USER
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_TOKEN_TF
-                variable: LAVA_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TUXSUITE_TOKEN
-                variable: TUXSUITE_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: ARMCLANG_UBL_CODE
-                variable: ARMCLANG_UBL_CODE
+      - timestamps
+      - timeout:
+          timeout: 120
+          fail: true
+      - credentials-binding:
+          - text:
+              credential-id: QA_REPORTS_TOKEN
+              variable: QA_REPORTS_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_USER_TF
+              variable: LAVA_USER
+      - credentials-binding:
+          - text:
+              credential-id: LAVA_TOKEN_TF
+              variable: LAVA_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: TUXSUITE_TOKEN
+              variable: TUXSUITE_TOKEN
+      - credentials-binding:
+          - text:
+              credential-id: ARMCLANG_UBL_CODE
+              variable: ARMCLANG_UBL_CODE
     builders:
-        - shell: |
-            aarch64-none-elf-gcc -v || true
-        - shell:
-            !include-raw: scripts/clone.sh
-        - shell:
-            !include-raw: tf-a-builder/lts-builders.sh
-        - inject:
-            properties-file: artefacts/env
-        - shell: |
-            ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
-            echo ${BIN_MODE:-release} >lava-binmode.txt
-        - conditional-step:
-            condition-kind: file-exists
-            on-evaluation-failure: dont-run
-            condition-filename: artefacts-lava/job.yaml
-            condition-basedir: workspace
-            steps:
-            - shell:  |
+      - shell: |
+          aarch64-none-elf-gcc -v || true
+      - shell: !include-raw: scripts/clone.sh
+      - shell: !include-raw: tf-a-builder/lts-builders.sh
+      - inject:
+          properties-file: artefacts/env
+      - shell: |
+          ln -s "artefacts/${BIN_MODE:-release}" "artefacts-lava"
+          echo ${BIN_MODE:-release} >lava-binmode.txt
+      - conditional-step:
+          condition-kind: file-exists
+          on-evaluation-failure: dont-run
+          condition-filename: artefacts-lava/job.yaml
+          condition-basedir: workspace
+          steps:
+            - shell: |
                 #!/bin/bash
                 set -e
                 DEVICE_TYPE=fvp
@@ -153,62 +151,61 @@
                 LAVA_SERVER=tf.validation.linaro.org
                 EOF
     publishers:
-        - archive:
-            artifacts: artefacts/**, lava-binmode.txt
-            latest-only: false
-            allow-empty: true
-        - conditional-publisher:
+      - archive:
+          artifacts: artefacts/**, lava-binmode.txt
+          latest-only: false
+          allow-empty: true
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: artefacts-lava/job.yaml
             condition-basedir: workspace
             action:
-                - postbuildscript:
-                    mark-unstable-if-failed: true
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - inject:
-                                properties-file: ${WORKSPACE}/lava.param
-                            - shell: |
-                                #!/bin/bash -x
+              - postbuildscript:
+                  mark-unstable-if-failed: true
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - inject:
+                            properties-file: ${WORKSPACE}/lava.param
+                        - shell: |
+                            #!/bin/bash -x
 
-                                tf-a-job-configs/tf-a-builder/submit-test-job.sh
-                                status=$?
-                                tf-a-job-configs/tf-a-builder/lava-log-process.sh
-                                if [ $status -ne 0 ]; then
-                                    echo "LAVA JOB RESULT: 1"
-                                    exit 1
-                                else
-                                    echo "LAVA JOB RESULT: 0"
-                                fi
-                - postbuildscript:
-                    builders:
-                        - role: SLAVE
-                          build-on:
-                              - SUCCESS
-                          build-steps:
-                            - shell: |
-                                #!/bin/bash -e
-                                echo "=== Starting expect-post tests ==="
-                                ./tf-a-ci-scripts/script/expect-post-runner.sh
-        - conditional-publisher:
+                            tf-a-job-configs/tf-a-builder/submit-test-job.sh
+                            status=$?
+                            tf-a-job-configs/tf-a-builder/lava-log-process.sh
+                            if [ $status -ne 0 ]; then
+                                echo "LAVA JOB RESULT: 1"
+                                exit 1
+                            else
+                                echo "LAVA JOB RESULT: 0"
+                            fi
+              - postbuildscript:
+                  builders:
+                    - role: SLAVE
+                      build-on:
+                        - SUCCESS
+                      build-steps:
+                        - shell: |
+                            #!/bin/bash -e
+                            echo "=== Starting expect-post tests ==="
+                            ./tf-a-ci-scripts/script/expect-post-runner.sh
+      - conditional-publisher:
           - condition-kind: file-exists
             on-evaluation-failure: dont-run
             condition-filename: lava-raw-debug.log
             condition-basedir: workspace
             action:
-                - archive:
-                    artifacts: lava-raw-debug.log
-                    latest-only: false
-                    allow-empty: true
-        - archive:
-            artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
-            latest-only: false
-            allow-empty: true
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-builder/postbuild.groovy
+              - archive:
+                  artifacts: lava-raw-debug.log
+                  latest-only: false
+                  allow-empty: true
+      - archive:
+          artifacts: lava.log, lava-*.log, tux.id, feedback.log, config_file.json, covtrace-*.log, trace_report/**
+          latest-only: false
+          allow-empty: true
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-builder/postbuild.groovy
diff --git a/tf-a-lts2.8-ci-gateway.yaml b/tf-a-lts2.8-ci-gateway.yaml
index fb9d820..7983d73 100644
--- a/tf-a-lts2.8-ci-gateway.yaml
+++ b/tf-a-lts2.8-ci-gateway.yaml
@@ -8,128 +8,126 @@
     description: |
       Main job entry point for a Trusted Firmware A (TF-A) CI.
     properties:
-    - build-discarder:
-        days-to-keep: 15
-    - throttle:
-        option: project
-        enabled: true
-        max-per-node: 3
-        max-total: 10
+      - build-discarder:
+          days-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-per-node: 3
+          max-total: 10
     wrappers:
-    - credentials-binding:
-      - ssh-user-private-key:
-          credential-id: TFA_CI_BOT_USER_SSH_KEY
-          key-file-variable: CI_BOT_KEY
-          username-variable: CI_BOT_USERNAME
-          passphrase-variable: ''
-    - workspace-cleanup
-    - timeout:
-        timeout: 240
-        fail: true
-    - timestamps
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - workspace-cleanup
+      - timeout:
+          timeout: 240
+          fail: true
+      - timestamps
     parameters:
-    - string:
-        name: TEST_GROUPS
-        default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
-        description: |
-          White space separated list of test configs: can be mix of specific
-          test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
-          group names (e.g., <code>l1 l2</code>).
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        description: |
-          trusted-firmware-a refspec to use. The master branch is used by default.
-    - string:
-        name: TFTF_GERRIT_REFSPEC
-        default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        description: |
-          tf-a-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_TESTS_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-m-tests refspec to use. The master branch is used by default.
-    - string:
-        name: TF_M_EXTRAS_GERRIT_REFSPEC
-        default: '+refs/heads/master:refs/remotes/origin/master'
-        description: |
-          tf-m-extras refspec to use. The master branch is used by default.
-    - string:
-       name: SPM_REFSPEC
-       default: '+refs/heads/master:refs/remotes/origin/master'
-       description: |
-         SPM(Hafnium) refspec to use. The master branch is used by default.
-    - string:
-        name: CI_REFSPEC
-        default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        description: |
-          tf-a-ci-scripts refspec to use. The master branch is used by default.
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
-          tf-a-job-configs refspec to use. The master branch is used by default.
-    - bool:
-        name: ENABLE_STATIC_CHECK
-        default: false
-    - string:
-        name: QA_TOOLS_REPO
-        default: 'https://git.gitlab.arm.com/tooling/qa-tools.git'
-    - string:
-        name: QA_TOOLS_BRANCH
-        default: 'master'
-    - string:
-        name: USE_TUXSUITE_FVP
-        default: 1
-        description: |
-          Whether to submit FVP tests via TuxSuite (instead of LAVA)
-    - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TEST_GROUPS
+          default: tf-l2-boot-tests-cortex/fvp-default:fvp-linux-dtb-fip.uboot-cortexa35x4-debug
+          description: |
+            White space separated list of test configs: can be mix of specific
+            test configs (e.g., <code>l1/fvp-default:fvp-linux-default</code>) and
+            group names (e.g., <code>l1 l2</code>).
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+          description: |
+            trusted-firmware-a refspec to use. The master branch is used by default.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+          description: |
+            tf-a-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_TESTS_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-m-tests refspec to use. The master branch is used by default.
+      - string:
+          name: TF_M_EXTRAS_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            tf-m-extras refspec to use. The master branch is used by default.
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+          description: |
+            tf-a-ci-scripts refspec to use. The master branch is used by default.
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - bool:
+          name: ENABLE_STATIC_CHECK
+          default: false
+      - string:
+          name: QA_TOOLS_REPO
+          default: https://git.gitlab.arm.com/tooling/qa-tools.git
+      - string:
+          name: QA_TOOLS_BRANCH
+          default: master
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        CI_ROOT=${PWD}/tf-a-ci-scripts
-        export workspace=$PWD
-        export test_groups=$TEST_GROUPS
-        $CI_ROOT/script/gen_test_desc.py
-        cat << EOF > share.param
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - trigger-builds:
-      - project:
-        - tf-a-lts2.8-builder
-        block: true
-        property-file: share.param
-        current-parameters: true
-        property-file-fail-on-missing: false
-        parameter-factories:
-        - factory: filebuild
-          file-pattern: '*.testprop'
-          no-files-found-action: FAIL
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          CI_ROOT=${PWD}/tf-a-ci-scripts
+          export workspace=$PWD
+          export test_groups=$TEST_GROUPS
+          $CI_ROOT/script/gen_test_desc.py
+          cat << EOF > share.param
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - trigger-builds:
+          - project:
+              - tf-a-lts2.8-builder
+            block: true
+            property-file: share.param
+            current-parameters: true
+            property-file-fail-on-missing: false
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: '*.testprop'
+                no-files-found-action: FAIL
     publishers:
-        - postbuildscript:
-            builders:
-                - role: SLAVE
-                  build-on:
-                      - SUCCESS
-                      - FAILURE
-                      - UNSTABLE
-                      - ABORTED
-                      - NOT_BUILT
-                  build-steps:
-                      - shell: |-
-                          #!/bin/bash -e
-                          export CI_ROOT=${PWD}/tf-a-ci-scripts
-                          bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
-        - archive:
-            artifacts: report.json, report.html, merge/outdir/**
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-ci-gateway/postbuild.groovy
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - UNSTABLE
+                - ABORTED
+                - NOT_BUILT
+              build-steps:
+                - shell: |-
+                    #!/bin/bash -e
+                    export CI_ROOT=${PWD}/tf-a-ci-scripts
+                    bash "$CI_ROOT/job/tf-ci-gateway/generate_report.sh"
+      - archive:
+          artifacts: report.json, report.html, merge/outdir/**
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-ci-gateway/postbuild.groovy
diff --git a/tf-a-lts2.8-gerrit-tforg-l1.yaml b/tf-a-lts2.8-gerrit-tforg-l1.yaml
index ed1f408..9dc97fa 100644
--- a/tf-a-lts2.8-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.8-gerrit-tforg-l1.yaml
@@ -8,151 +8,150 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 90
-        num-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: 15
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.8'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: SPM_REFSPEC
+          default: v2.8
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Lint commit messages
-        condition: COMPLETED
-        projects:
-        - name: tf-a-commitlint
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
-            REFSPEC=${GERRIT_REFSPEC}
-            REFNAME=${GERRIT_PATCHSET_REVISION}
-            REFNAME_BASE=origin/${GERRIT_BRANCH}
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tf-l2-scan-build
-            ENABLE_STATIC_CHECK=true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run build tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Lint commit messages
+          condition: COMPLETED
+          projects:
+            - name: tf-a-commitlint
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                URL=https://review.trustedfirmware.org/${GERRIT_PROJECT}
+                REFSPEC=${GERRIT_REFSPEC}
+                REFNAME=${GERRIT_PATCHSET_REVISION}
+                REFNAME_BASE=origin/${GERRIT_BRANCH}
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tf-l2-scan-build
+                ENABLE_STATIC_CHECK=true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run build tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-build-fvp tf-l1-build-juno tf-l1-build-clang tf-l1-build-plat spm-l1-build-tests
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-        - project-compare-type: PLAIN
-          project-pattern: TF-A/trusted-firmware-a
-          branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: lts-v2.8
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.8
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.8-gerrit-tforg-l2.yaml b/tf-a-lts2.8-gerrit-tforg-l2.yaml
index 938a9f1..4159661 100644
--- a/tf-a-lts2.8-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.8-gerrit-tforg-l2.yaml
@@ -8,178 +8,176 @@
       Job that triggers for every TF-A patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 90
-        num-to-keep: 15
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: 15
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.8'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: SPM_REFSPEC
+          default: v2.8
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build Trusted Firmware
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: TFTF tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Boot up to the Linux shell prompt
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
-            TF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - conditional-step:
-        condition-command: |-
-          [ "$NOMINATION_FILE" ]
-        condition-kind: shell
-        on-evaluation-failure: dont-run
-        steps:
-        - multijob:
-            condition: COMPLETED
-            name: Nominated tests
-            projects:
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build Trusted Firmware
+          projects:
             - kill-phase-on: NEVER
               name: tf-a-lts2.8-ci-gateway
               current-parameters: true
               predefined-parameters: |
-                TEST_GROUPS=@$NOMINATION_FILE
+                TEST_GROUPS=tf-l2-build-fvp tf-l2-build-juno
                 TF_REFSPEC=$GERRIT_REFSPEC
               property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: TFTF tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp tftf-l1-juno tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq tftf-l2-fwu tftf-l2-fvp
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Boot up to the Linux shell prompt
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tf-l2-boot-tests-aarch32 tf-l2-boot-tests-bl2_el3 tf-l2-boot-tests-cortex tf-l2-boot-tests-juno tf-l2-boot-tests-latest tf-l2-boot-tests-misc tf-l2-boot-tests-rootfs tf-l2-boot-tests-spm-mm spm-l2-boot-tests
+                TF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - conditional-step:
+          condition-command: '[ "$NOMINATION_FILE" ]'
+          condition-kind: shell
+          on-evaluation-failure: dont-run
+          steps:
+            - multijob:
+                condition: COMPLETED
+                name: Nominated tests
+                projects:
+                  - kill-phase-on: NEVER
+                    name: tf-a-lts2.8-ci-gateway
+                    current-parameters: true
+                    predefined-parameters: |
+                      TEST_GROUPS=@$NOMINATION_FILE
+                      TF_REFSPEC=$GERRIT_REFSPEC
+                    property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/trusted-firmware-a
-            branches:
-              - branch-compare-type: PLAIN
-                branch-pattern: lts-v2.8
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        failure-message: 'OpenCI: build failed'
-        successful-message: 'OpenCI: build successful'
-        unstable-message: 'OpenCI: build unstable'
-        notbuilt-message: 'OpenCI: no builds executed'
-        silent: false
-        silent-start: false
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.8
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          failure-message: 'OpenCI: build failed'
+          successful-message: 'OpenCI: build successful'
+          unstable-message: 'OpenCI: build unstable'
+          notbuilt-message: 'OpenCI: no builds executed'
+          silent: false
+          silent-start: false
diff --git a/tf-a-lts2.8-main.yaml b/tf-a-lts2.8-main.yaml
index 0619953..dda7ab5 100644
--- a/tf-a-lts2.8-main.yaml
+++ b/tf-a-lts2.8-main.yaml
@@ -16,38 +16,38 @@
     parameters:
       - string:
           name: TF_GERRIT_PROJECT
-          default: 'TF-A/trusted-firmware-a'
+          default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: 'refs/heads/lts-v2.8'
+          default: refs/heads/lts-v2.8
       - string:
           name: TF_GERRIT_REFSPEC
-          default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
       - string:
           name: TFTF_GERRIT_PROJECT
-          default: 'TF-A/tf-a-tests'
+          default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 'refs/heads/lts-v2.8'
+          default: refs/heads/lts-v2.8
       - string:
           name: TFTF_GERRIT_REFSPEC
-          default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
       - string:
-         name: SPM_REFSPEC
-         default: 'v2.8'
-         description: |
-           SPM(Hafnium) refspec to use. The master branch is used by default.
+          name: SPM_REFSPEC
+          default: v2.8
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
       - string:
           name: CI_REFSPEC
-          default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
       - string:
           name: JOBS_REFSPEC
-          default: 'refs/heads/master'
+          default: refs/heads/master
           description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
       - string:
           name: MBEDTLS_URL
-          default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
       - string:
           name: LAVA_RETRIES
           default: 2
@@ -66,22 +66,21 @@
             However, you can always force to run the build
       - string:
           name: SHARE_FOLDER
-          default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-          description: 'Folder containing shared repositories for downstream pipeline jobs'
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     triggers:
-      - timed: 'H H(0-7) * * 3,6'
+      - timed: H H(0-7) * * 3,6
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-      - shell:
-          !include-raw: scripts/clone.sh
+      - shell: !include-raw: scripts/clone.sh
       - shell: |
           #!/bin/bash
           set -e
@@ -101,8 +100,7 @@
           QA_SERVER_VERSION=${BUILD_NUMBER}
           SHARE_FOLDER=${SHARE_FOLDER}
           EOF
-      - shell:
-          !include-raw: scripts/lts-check-last-commit.sh
+      - shell: !include-raw: scripts/lts-check-last-commit.sh
       - conditional-step:
           condition-kind: file-exists
           condition-filename: TO_BUILD
@@ -112,212 +110,212 @@
                 name: Run static checks on the code
                 condition: COMPLETED
                 projects:
-                - name: tf-a-static-checks
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  property-file: tf-a-env.param
+                  - name: tf-a-static-checks
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    property-file: tf-a-env.param
             - multijob:
                 name: Build Trusted Firmware
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l1-build-fvp tf-l2-build-fvp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: |
-                    TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l1-build-juno tf-l2-build-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l1-build-plat
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-plat
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l1-build-clang
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-build-clang
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l1-build-fvp tf-l2-build-fvp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: |
+                      TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l1-build-juno tf-l2-build-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l1-build-plat
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-plat
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l1-build-clang
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-build-clang
+                    property-file: tf-a-env.param
             - multijob:
                 name: TFTF Tests for FVP
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tftf-l2-fwu
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-fwu
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
-                  property-file: tf-a-tests-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tftf-l2-extensive-tests-fvp
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
-                  property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tftf-l2-fwu
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-fwu
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
+                    property-file: tf-a-tests-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tftf-l2-extensive-tests-fvp
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
+                    property-file: tf-a-tests-env.param
             - multijob:
                 name: Boot up to the Linux shell prompt
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-aarch32
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-rootfs
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-spm-mm
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: spm-l2-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-aarch32
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-rootfs
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-spm-mm
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: spm-l2-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
+                    property-file: tf-a-env.param
             - multijob:
                 name: Boot up to the Linux shell prompt - Part 2
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-misc
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-latest
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-cortex
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-gicv2
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-bl2_el3
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: qemu-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=qemu-boot-tests
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-misc
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-latest
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-cortex
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-gicv2
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-bl2_el3
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: qemu-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=qemu-boot-tests
+                    property-file: tf-a-env.param
             - multijob:
                 name: Juno Boot Tests
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l2-boot-tests-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tftf-l1-juno
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tftf-l1-juno
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l2-boot-tests-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tftf-l1-juno
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tftf-l1-juno
+                    property-file: tf-a-env.param
             - multijob:
                 name: Miscellaneous tests
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l3-boot-tests-css
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l3-boot-tests-spm-mm
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l3-boot-tests-ras
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l3-boot-tests-misc
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: spm-l3-boot-tests
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
-                  property-file: tf-a-env.param
-                - name: tf-a-lts2.8-ci-gateway
-                  alias: tf-l1-boot-tests-plat
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-boot-tests-plat
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l3-boot-tests-css
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l3-boot-tests-spm-mm
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l3-boot-tests-ras
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l3-boot-tests-misc
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: spm-l3-boot-tests
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
+                    property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    alias: tf-l1-boot-tests-plat
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-boot-tests-plat
+                    property-file: tf-a-env.param
             - multijob:
                 name: Run doc build check
                 condition: COMPLETED
                 projects:
-                - name: tf-a-lts2.8-ci-gateway
-                  current-parameters: true
-                  kill-phase-on: NEVER
-                  predefined-parameters: TEST_GROUPS=tf-l1-check-docs
-                  property-file: tf-a-env.param
+                  - name: tf-a-lts2.8-ci-gateway
+                    current-parameters: true
+                    kill-phase-on: NEVER
+                    predefined-parameters: TEST_GROUPS=tf-l1-check-docs
+                    property-file: tf-a-env.param
             - multijob:
                 name: Generate visualizations
                 condition: COMPLETED
                 projects:
-#                  - name: tf-a-sloc-visualization
-#                    current-parameters: true
-#                    kill-phase-on: NEVER
-#                    property-file: tf-a-env.param
-#                  - name: tf-a-test-category-visualization
-#                    current-parameters: true
-#                    kill-phase-on: NEVER
-#                    property-file: tf-a-env.param
+                  #                  - name: tf-a-sloc-visualization
+                  #                    current-parameters: true
+                  #                    kill-phase-on: NEVER
+                  #                    property-file: tf-a-env.param
+                  #                  - name: tf-a-test-category-visualization
+                  #                    current-parameters: true
+                  #                    kill-phase-on: NEVER
+                  #                    property-file: tf-a-env.param
                   - name: tf-a-test-result-visualization
                     current-parameters: true
                     kill-phase-on: NEVER
@@ -346,6 +344,6 @@
                   script: |
                     def currentBuild = Thread.currentThread().executable
                     currentBuild.setDescription("There are no new commits in the repositories, skip the build!")
-                  on-failure: "nothing"
+                  on-failure: nothing
       - email:
           recipients: bipin.ravi@arm.com, vwadekar@nvidia.com, yann.gautier@st.com, jidong@google.com, govindraj.raja@arm.com
diff --git a/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml b/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml
index 1abcc23..8efd975 100644
--- a/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml
@@ -8,147 +8,145 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.8'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: v2.8
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            REPO_UNDER_TEST=tf-a-tests
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-build
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Basic TF-A-Tests test cases
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: REPO_UNDER_TEST=tf-a-tests
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-build
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Basic TF-A-Tests test cases
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/tf-a-tests
-            branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: lts-v2.8
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.8
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml b/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml
index 2800cbf..e8aa5f3 100644
--- a/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml
@@ -8,148 +8,147 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/lts-v2.8'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: 'v2.8'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/lts-v2.8
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: v2.8
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-tftf-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Firmware Update Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fwu
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Level 2 testing of TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run extensive TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-lts2.8-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-extensive-tests-fvp
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-tftf-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Firmware Update Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fwu
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Level 2 testing of TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run extensive TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-lts2.8-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-extensive-tests-fvp
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: lts-v2.8
-          project-compare-type: PLAIN
-          project-pattern: TF-A/tf-a-tests
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: lts-v2.8
+              project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-main-tfa-next.yaml b/tf-a-main-tfa-next.yaml
index 1912dab..5a3bbd5 100644
--- a/tf-a-main-tfa-next.yaml
+++ b/tf-a-main-tfa-next.yaml
@@ -6,23 +6,23 @@
     disabled: false
     description: Main CI job for Trusted Firmware Next
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'tfa-next'
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/trusted-firmware-a'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: tfa-next
+              project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -30,143 +30,142 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_CI$'
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_CI$
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/tfa-next'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,trusted-firmware-a"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/tfa-next
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,trusted-firmware-a
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        TF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Lint commit messages
-        condition: COMPLETED
-        projects:
-        - name: tf-a-commitlint-tfa-next
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            REFSPEC=${GERRIT_REFSPEC}
-            REFNAME=${GERRIT_PATCHSET_REVISION}
-            REFNAME_BASE=origin/${GERRIT_BRANCH}
-    - multijob:
-        name: Code formatting, static checks and lints
-        condition: COMPLETED
-        projects:
-        - name: tf-a-static-tfa-next
-          current-parameters: true
-          kill-phase-on: NEVER
-          property-file: tf-a-env.param
-    - multijob:
-        name: Platform independent tests
-        condition: COMPLETED
-        projects:
-        - name: generic-lib-testing
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_REPO_NAME=trusted-firmware-a
-            TEST_REPO_PROJECT=TF-A
-          property-file: tf-a-env.param
-    - multijob:
-        name: Build Trusted Firmware
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway-tfa-next
-          alias: tf-next-build
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_GROUPS=tf-next-build
-          property-file: tf-a-env.param
-    - multijob:
-        name: FVP Tests
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway-tfa-next
-          alias: rfa-fvp
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_GROUPS=rfa-fvp
-          property-file: tf-a-env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          TF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Lint commit messages
+          condition: COMPLETED
+          projects:
+            - name: tf-a-commitlint-tfa-next
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                REFSPEC=${GERRIT_REFSPEC}
+                REFNAME=${GERRIT_PATCHSET_REVISION}
+                REFNAME_BASE=origin/${GERRIT_BRANCH}
+      - multijob:
+          name: Code formatting, static checks and lints
+          condition: COMPLETED
+          projects:
+            - name: tf-a-static-tfa-next
+              current-parameters: true
+              kill-phase-on: NEVER
+              property-file: tf-a-env.param
+      - multijob:
+          name: Platform independent tests
+          condition: COMPLETED
+          projects:
+            - name: generic-lib-testing
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_REPO_NAME=trusted-firmware-a
+                TEST_REPO_PROJECT=TF-A
+              property-file: tf-a-env.param
+      - multijob:
+          name: Build Trusted Firmware
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway-tfa-next
+              alias: tf-next-build
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_GROUPS=tf-next-build
+              property-file: tf-a-env.param
+      - multijob:
+          name: FVP Tests
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway-tfa-next
+              alias: rfa-fvp
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_GROUPS=rfa-fvp
+              property-file: tf-a-env.param
diff --git a/tf-a-main.yaml b/tf-a-main.yaml
index 59a5ec4..6671234 100644
--- a/tf-a-main.yaml
+++ b/tf-a-main.yaml
@@ -6,359 +6,358 @@
     disabled: false
     description: Main CI job for Trusted Firmware.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     parameters:
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-           name: SPM_REFSPEC
-           default: '+refs/heads/master:refs/remotes/origin/master'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-           name: RMM_REFSPEC
-           default: '+refs/heads/main:refs/remotes/origin/main'
-           description: |
-             tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        GERRIT_PROJECT=${TF_GERRIT_PROJECT}
-        GERRIT_BRANCH=${TF_GERRIT_BRANCH}
-        GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-        cat << EOF > tf-a-tests-env.param
-        GERRIT_PROJECT=${TFTF_GERRIT_PROJECT}
-        GERRIT_BRANCH=${TFTF_GERRIT_BRANCH}
-        GERRIT_REFSPEC=${TFTF_GERRIT_REFSPEC}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: Run static checks on the code
-        condition: COMPLETED
-        projects:
-        - name: tf-a-static-checks
-          current-parameters: true
-          kill-phase-on: NEVER
-          property-file: tf-a-env.param
-    - multijob:
-        name: Build Trusted Firmware
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l1-build-fvp tf-l2-build-fvp
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: |
-            TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l1-build-juno tf-l2-build-juno
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l1-build-plat
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l1-build-plat
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l1-build-clang
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l1-build-clang
-          property-file: tf-a-env.param
-    - multijob:
-        name: TFTF Tests for FVP
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tftf-l2-fwu
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tftf-l2-fwu
-          property-file: tf-a-tests-env.param
-        - name: tf-a-ci-gateway
-          alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
-          property-file: tf-a-tests-env.param
-        - name: tf-a-ci-gateway
-          alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
-          property-file: tf-a-tests-env.param
-        - name: tf-a-ci-gateway
-          alias: tftf-l2-extensive-tests-fvp
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
-          property-file: tf-a-tests-env.param
-    - multijob:
-        name: Boot up to the Linux shell prompt
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-aarch32
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-rootfs
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-spm-mm
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: spm-l2-boot-tests
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
-          property-file: tf-a-env.param
-    - multijob:
-        name: Boot up to the Linux shell prompt - Part 2
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-misc
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-latest
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-cortex
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-gicv2
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-bl2_el3
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: qemu-boot-tests
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=qemu-boot-tests
-          property-file: tf-a-env.param
-    - multijob:
-        name: Juno Boot Tests
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-juno
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tftf-l1-juno
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tftf-l1-juno
-          property-file: tf-a-env.param
-    - multijob:
-        name: Miscellaneous tests
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l3-boot-tests-css
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l3-boot-tests-spm-mm
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l3-boot-tests-ras
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l3-boot-tests-misc
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l3-boot-tests-n1sdp
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-n1sdp
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: spm-l3-boot-tests
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
-          property-file: tf-a-env.param
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-partner-boards
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-partner-boards
-          property-file: tf-a-env.param
-        # Platform-specific self-tests.
-        # These tests run from the BL31 image then halt the target.
-        - name: tf-a-ci-gateway
-          alias: tf-l2-boot-tests-arm-plats
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-arm-plats
-          property-file: tf-a-env.param
-    - multijob:
-        name: Run doc build check
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l1-check-docs
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l1-check-docs
-          property-file: tf-a-env.param
-    - multijob:
-        name: Generate visualizations
-        condition: COMPLETED
-        projects:
-          - name: tf-a-sloc-visualization
-            current-parameters: true
-            kill-phase-on: NEVER
-            property-file: tf-a-env.param
-          - name: tf-a-test-category-visualization
-            current-parameters: true
-            kill-phase-on: NEVER
-            property-file: tf-a-env.param
-          - name: tf-a-test-result-visualization
-            current-parameters: true
-            kill-phase-on: NEVER
-            predefined-parameters: TARGET_BUILD=${JOB_NAME}/${BUILD_NUMBER}
-            property-file: tf-a-env.param
-    # Run the unstable TF-A Tests at the end but do not let their results
-    # participate in the job's success/failure.
-    - trigger-builds:
-        - project: tf-a-ci-gateway
-          current-parameters: True
-          property-file: tf-a-tests-env.param
-          property-file-fail-on-missing: True
-          predefined-parameters: TEST_GROUPS=tftf-unstable
-          block: True
-          block-thresholds:
-            build-step-failure-threshold: never
-            unstable-threshold: never
-            failure-threshold: never
-    # If all tests passed, catch up the master branch with integration
-    - conditional-step:
-        condition-kind: current-status
-        condition-best: SUCCESS
-        condition-worst: SUCCESS
-        steps:
-        - shell: |-
-            #!/bin/bash
-            #
-            if echo ${JENKINS_PUBLIC_URL} | grep -q "ci.trustedfirmware.org"; then
-                # Only do it on the OpenCI production site
-                echo "It's running on the OpenCI procution site"
-                if [ $MULTIJOB_FAILED -eq 0 ]; then
-                    echo "Proceed with integration->master fast-forward merge"
-                    bash "${WORKSPACE}/tf-a-ci-scripts/script/scratch_scripts/fast-forward-master.sh"
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          GERRIT_PROJECT=${TF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+          cat << EOF > tf-a-tests-env.param
+          GERRIT_PROJECT=${TFTF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TFTF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TFTF_GERRIT_REFSPEC}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: Run static checks on the code
+          condition: COMPLETED
+          projects:
+            - name: tf-a-static-checks
+              current-parameters: true
+              kill-phase-on: NEVER
+              property-file: tf-a-env.param
+      - multijob:
+          name: Build Trusted Firmware
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l1-build-fvp tf-l2-build-fvp
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: |
+                TEST_GROUPS=tf-l1-build-fvp tf-l2-build-fvp
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l1-build-juno tf-l2-build-juno
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l1-build-juno tf-l2-build-juno
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l1-build-plat
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l1-build-plat
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l1-build-clang
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l1-build-clang
+              property-file: tf-a-env.param
+      - multijob:
+          name: TFTF Tests for FVP
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tftf-l2-fwu
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tftf-l2-fwu
+              property-file: tf-a-tests-env.param
+            - name: tf-a-ci-gateway
+              alias: tftf-l1-fvp tftf-l2-fvp-auxiliary
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l2-fvp-auxiliary
+              property-file: tf-a-tests-env.param
+            - name: tf-a-ci-gateway
+              alias: tftf-l2-fvp tftf-l2-fvp-dynamiq
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tftf-l2-fvp tftf-l2-fvp-dynamiq
+              property-file: tf-a-tests-env.param
+            - name: tf-a-ci-gateway
+              alias: tftf-l2-extensive-tests-fvp
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
+              property-file: tf-a-tests-env.param
+      - multijob:
+          name: Boot up to the Linux shell prompt
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-aarch32
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-aarch32
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-rootfs
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-rootfs
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-spm-mm
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-spm-mm
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: spm-l2-boot-tests
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=spm-l2-boot-tests
+              property-file: tf-a-env.param
+      - multijob:
+          name: Boot up to the Linux shell prompt - Part 2
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-misc
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-misc
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-latest
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-latest
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-cortex
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-cortex
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-gicv2
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-gicv2
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-bl2_el3
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-bl2_el3
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: qemu-boot-tests
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=qemu-boot-tests
+              property-file: tf-a-env.param
+      - multijob:
+          name: Juno Boot Tests
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-juno
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-juno
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tftf-l1-juno
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tftf-l1-juno
+              property-file: tf-a-env.param
+      - multijob:
+          name: Miscellaneous tests
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l3-boot-tests-css
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-css
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l3-boot-tests-spm-mm
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-spm-mm
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l3-boot-tests-ras
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-ras
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l3-boot-tests-misc
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-misc
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l3-boot-tests-n1sdp
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l3-boot-tests-n1sdp
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: spm-l3-boot-tests
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=spm-l3-boot-tests
+              property-file: tf-a-env.param
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-partner-boards
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-partner-boards
+              property-file: tf-a-env.param
+            # Platform-specific self-tests.
+            # These tests run from the BL31 image then halt the target.
+            - name: tf-a-ci-gateway
+              alias: tf-l2-boot-tests-arm-plats
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l2-boot-tests-arm-plats
+              property-file: tf-a-env.param
+      - multijob:
+          name: Run doc build check
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l1-check-docs
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l1-check-docs
+              property-file: tf-a-env.param
+      - multijob:
+          name: Generate visualizations
+          condition: COMPLETED
+          projects:
+            - name: tf-a-sloc-visualization
+              current-parameters: true
+              kill-phase-on: NEVER
+              property-file: tf-a-env.param
+            - name: tf-a-test-category-visualization
+              current-parameters: true
+              kill-phase-on: NEVER
+              property-file: tf-a-env.param
+            - name: tf-a-test-result-visualization
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TARGET_BUILD=${JOB_NAME}/${BUILD_NUMBER}
+              property-file: tf-a-env.param
+      # Run the unstable TF-A Tests at the end but do not let their results
+      # participate in the job's success/failure.
+      - trigger-builds:
+          - project: tf-a-ci-gateway
+            current-parameters: True
+            property-file: tf-a-tests-env.param
+            property-file-fail-on-missing: True
+            predefined-parameters: TEST_GROUPS=tftf-unstable
+            block: True
+            block-thresholds:
+              build-step-failure-threshold: never
+              unstable-threshold: never
+              failure-threshold: never
+      # If all tests passed, catch up the master branch with integration
+      - conditional-step:
+          condition-kind: current-status
+          condition-best: SUCCESS
+          condition-worst: SUCCESS
+          steps:
+            - shell: |-
+                #!/bin/bash
+                #
+                if echo ${JENKINS_PUBLIC_URL} | grep -q "ci.trustedfirmware.org"; then
+                    # Only do it on the OpenCI production site
+                    echo "It's running on the OpenCI procution site"
+                    if [ $MULTIJOB_FAILED -eq 0 ]; then
+                        echo "Proceed with integration->master fast-forward merge"
+                        bash "${WORKSPACE}/tf-a-ci-scripts/script/scratch_scripts/fast-forward-master.sh"
+                    else
+                        echo "Do not proceed with integration->master merge as sub-jobs failed"
+                    fi
                 else
-                    echo "Do not proceed with integration->master merge as sub-jobs failed"
+                    echo "It's NOT on the OpenCI production site"
                 fi
-            else
-                echo "It's NOT on the OpenCI production site"
-            fi
diff --git a/tf-a-sloc-visualization.yaml b/tf-a-sloc-visualization.yaml
index 881161f..2ee0e90 100644
--- a/tf-a-sloc-visualization.yaml
+++ b/tf-a-sloc-visualization.yaml
@@ -1,42 +1,41 @@
 - job:
     name: tf-a-sloc-visualization
-    description: >-
-      Generates a visualization of programming languages used by the code-base.
+    description: Generates a visualization of programming languages used by the code-base.
     node: docker-amd64-tf-a-jammy
     concurrent: true
     properties:
-    - build-discarder:
-        days-to-keep: 30
+      - build-discarder:
+          days-to-keep: 30
     parameters:
-    - string:
-        name: CI_REFSPEC
-        default: +refs/heads/master:refs/remotes/origin/master
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
-          tf-a-job-configs refspec to use. The master branch is used by default.
-    - string:
-        name: TF_GERRIT_PROJECT
-        default: TF-A/trusted-firmware-a
-    - string:
-        name: TF_GERRIT_BRANCH
-        default: refs/heads/master
-    - string:
-        name: TF_GERRIT_REFSPEC
-        default: +refs/heads/master:refs/remotes/origin/master
-    - string:
-        name: DIRECTORIES
-        default: . ./drivers ./plat ./tools
-        description: List of directories to analyze.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: DIRECTORIES
+          default: . ./drivers ./plat ./tools
+          description: List of directories to analyze.
     builders:
-    - shell: !include-raw: scripts/clone.sh
-    - shell: |
-        mkdir -p output
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          mkdir -p output
 
-        cd trusted-firmware-a &&
-          bash ../tf-a-ci-scripts/script/graphs/sloc-viz.bash ${DIRECTORIES} \
-            > ../output.png 2> ../output.tsv
+          cd trusted-firmware-a &&
+            bash ../tf-a-ci-scripts/script/graphs/sloc-viz.bash ${DIRECTORIES} \
+              > ../output.png 2> ../output.tsv
     publishers:
-    - archive:
-        artifacts: output.*
+      - archive:
+          artifacts: output.*
diff --git a/tf-a-static-checks.yaml b/tf-a-static-checks.yaml
index 3d36d31..ff15db5 100644
--- a/tf-a-static-checks.yaml
+++ b/tf-a-static-checks.yaml
@@ -7,87 +7,84 @@
     defaults: global
     description: Run static checks on Git repository
     properties:
-        - build-discarder:
-            days-to-keep: 14
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-                tf-a-job-configs refspec to use. The master branch is used by default.
-        - choice:
-            name: REPO_UNDER_TEST
-            choices:
-                - trusted-firmware-a
-                - tf-a-tests
-            default: trusted-firmware-a
-            description: |-
-                Repository to run static checks on.
-        - string:
-            name: GERRIT_BRANCH
-            default: ''
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - choice:
+          name: REPO_UNDER_TEST
+          choices:
+            - trusted-firmware-a
+            - tf-a-tests
+          default: trusted-firmware-a
+          description: Repository to run static checks on.
+      - string:
+          name: GERRIT_BRANCH
+          default: ""
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
-        - timestamps
-        - timeout:
-            timeout: 240
-            fail: true
+      - timestamps
+      - timeout:
+          timeout: 240
+          fail: true
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-       #!/bin/bash
-       set -e
-       if [[ "${REPO_UNDER_TEST}" == trusted-firmware-a ]]; then
-       cat <<EOF > env.param
-       QA_SERVER_PROJECT=${JOB_NAME}
-       QA_SERVER_VERSION=${BUILD_NUMBER}
-       GERRIT_PROJECT=${TF_GERRIT_PROJECT}
-       GERRIT_BRANCH=${TF_GERRIT_BRANCH}
-       GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
-       TEST_GROUPS=tf-l2-scan-build
-       EOF
-       fi
-       cd ${WORKSPACE}/${REPO_UNDER_TEST}
-       # Executed project-related static checks: copyright presence, headers in alphabetical order,
-       # line endings, coding style and banned API.
-       IS_CONTINUOUS_INTEGRATION=1 ${WORKSPACE}/tf-a-ci-scripts/script/static-checks/static-checks.sh
-    - trigger-builds:
-      - project: tf-a-ci-gateway
-        block: true
-        property-file: env.param
-        current-parameters: true
-        # Do not trigger tf-a-ci-gateway if env.param file does not exist,
-        # which is the case here for TF-A Tests repository
-        property-file-fail-on-missing: True
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          if [[ "${REPO_UNDER_TEST}" == trusted-firmware-a ]]; then
+          cat <<EOF > env.param
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          GERRIT_PROJECT=${TF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
+          TEST_GROUPS=tf-l2-scan-build
+          EOF
+          fi
+          cd ${WORKSPACE}/${REPO_UNDER_TEST}
+          # Executed project-related static checks: copyright presence, headers in alphabetical order,
+          # line endings, coding style and banned API.
+          IS_CONTINUOUS_INTEGRATION=1 ${WORKSPACE}/tf-a-ci-scripts/script/static-checks/static-checks.sh
+      - trigger-builds:
+          - project: tf-a-ci-gateway
+            block: true
+            property-file: env.param
+            current-parameters: true
+            # Do not trigger tf-a-ci-gateway if env.param file does not exist,
+            # which is the case here for TF-A Tests repository
+            property-file-fail-on-missing: True
     publishers:
-        - archive:
-            artifacts: '${REPO_UNDER_TEST}/static-checks.log'
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - tf-a-static-checks/postbuild.groovy
+      - archive:
+          artifacts: ${REPO_UNDER_TEST}/static-checks.log
+      - groovy-postbuild:
+          script: !include-raw:
+            - tf-a-static-checks/postbuild.groovy
diff --git a/tf-a-static-cppcheck.yaml b/tf-a-static-cppcheck.yaml
index ad55479..e2278cf 100644
--- a/tf-a-static-cppcheck.yaml
+++ b/tf-a-static-cppcheck.yaml
@@ -1,78 +1,78 @@
 - defaults:
     name: global
-    gerrit-project: 'TF-A/trusted-firmware-a'
-    gerrit-branch: 'master'
-    gerrit-refspec: 'refs/heads/master'
-    days-history: '180'
-    num-to-keep: '180'
-    exec-node: 'docker-amd64-tf-a-jammy'
+    gerrit-project: TF-A/trusted-firmware-a
+    gerrit-branch: master
+    gerrit-refspec: refs/heads/master
+    days-history: "180"
+    num-to-keep: "180"
+    exec-node: docker-amd64-tf-a-jammy
 - scm:
     name: tf-a-ci-scripts
     scm:
-        - git:
-            url: https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            basedir: tf-a-ci-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
+      - git:
+          url: https://git.trustedfirmware.org/ci/tf-a-ci-scripts.git
+          refspec: +refs/heads/master:refs/remotes/origin/master
+          name: origin
+          branches:
+            - refs/heads/master
+          basedir: tf-a-ci-scripts
+          skip-tag: true
+          shallow-clone: true
+          wipe-workspace: false
 - scm:
     name: trusted-firmware-a
     scm:
-        - git:
-            url: https://review.trustedfirmware.org/${GERRIT_PROJECT}
-            refspec: ${GERRIT_REFSPEC}
-            name: origin
-            branches:
-                - ${GERRIT_BRANCH}
-            basedir: trusted-firmware-a
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
+      - git:
+          url: https://review.trustedfirmware.org/${GERRIT_PROJECT}
+          refspec: ${GERRIT_REFSPEC}
+          name: origin
+          branches:
+            - ${GERRIT_BRANCH}
+          basedir: trusted-firmware-a
+          skip-tag: true
+          shallow-clone: true
+          wipe-workspace: false
 - job-template:
     name: '{name}-{static}'
     project-type: freestyle
     defaults: global
     properties:
-        - build-discarder:
-            days-to-keep: '{days-history}'
-            num-to-keep: '{num-to-keep}'
+      - build-discarder:
+          days-to-keep: '{days-history}'
+          num-to-keep: '{num-to-keep}'
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: '{gerrit-project}'
-        - string:
-            name: GERRIT_BRANCH
-            default: '{gerrit-branch}'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '{gerrit-refspec}'
+      - string:
+          name: GERRIT_PROJECT
+          default: '{gerrit-project}'
+      - string:
+          name: GERRIT_BRANCH
+          default: '{gerrit-branch}'
+      - string:
+          name: GERRIT_REFSPEC
+          default: '{gerrit-refspec}'
     disabled: false
     node: '{exec-node}'
-    display-name: 'Trusted Firmware A (TF-A) {static}'
+    display-name: Trusted Firmware A (TF-A) {static}
     scm:
-        - tf-a-ci-scripts
-        - trusted-firmware-a
+      - tf-a-ci-scripts
+      - trusted-firmware-a
     wrappers:
-        - timestamps
+      - timestamps
     builders:
-        - shell:  |
-            #!/bin/bash
-            set -e
-            cd "${{WORKSPACE}}/trusted-firmware-a"
-            "${{WORKSPACE}}/tf-a-ci-scripts/{check-script}"
-            cd -
+      - shell: |
+          #!/bin/bash
+          set -e
+          cd "${{WORKSPACE}}/trusted-firmware-a"
+          "${{WORKSPACE}}/tf-a-ci-scripts/{check-script}"
+          cd -
     publishers:
-        - archive:
-            artifacts: 'artefacts/**'
-            latest-only: false
+      - archive:
+          artifacts: artefacts/**
+          latest-only: false
 - project:
     name: tf-a-static
     static:
-        - cppcheck:
-            check-script: "script/static-checks/static-checks-cppcheck.sh"
+      - cppcheck:
+          check-script: script/static-checks/static-checks-cppcheck.sh
     jobs:
-    - '{name}-{static}'
+      - '{name}-{static}'
diff --git a/tf-a-static-tfa-next.yaml b/tf-a-static-tfa-next.yaml
index 0634169..e3c4760 100644
--- a/tf-a-static-tfa-next.yaml
+++ b/tf-a-static-tfa-next.yaml
@@ -7,87 +7,86 @@
     defaults: global
     description: Run formatting, static checks and lints
     properties:
-        - build-discarder:
-            days-to-keep: 14
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/tfa-next'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: GERRIT_BRANCH
-            default: ''
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "tf-a-ci-scripts,trusted-firmware-a"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/tfa-next
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: GERRIT_BRANCH
+          default: ""
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: tf-a-ci-scripts,trusted-firmware-a
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,trusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
-        - credentials-binding:
-            - ssh-user-private-key:
-                credential-id: TFA_CI_BOT_USER_SSH_KEY
-                key-file-variable: CI_BOT_KEY
-                username-variable: CI_BOT_USERNAME
-                passphrase-variable: ''
-        - timestamps
-        - timeout:
-            timeout: 240
-            fail: true
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - timestamps
+      - timeout:
+          timeout: 240
+          fail: true
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-       #!/bin/bash
-       set -e
-       cat << EOF > env.param
-       QA_SERVER_PROJECT=${JOB_NAME}
-       QA_SERVER_VERSION=${BUILD_NUMBER}
-       GERRIT_PROJECT=${TF_GERRIT_PROJECT}
-       GERRIT_BRANCH=${TF_GERRIT_BRANCH}
-       GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
-       EOF
-       cd ${WORKSPACE}/trusted-firmware-a
-       # Executed project-related static checks: copyright, unix line endings,
-       # formatting and lints
-       IS_CONTINUOUS_INTEGRATION=1 ${WORKSPACE}/tf-a-ci-scripts/script/next-checks/next-checks.sh
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          GERRIT_PROJECT=${TF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
+          EOF
+          cd ${WORKSPACE}/trusted-firmware-a
+          # Executed project-related static checks: copyright, unix line endings,
+          # formatting and lints
+          IS_CONTINUOUS_INTEGRATION=1 ${WORKSPACE}/tf-a-ci-scripts/script/next-checks/next-checks.sh
     publishers:
-        - archive:
-            artifacts: 'trusted-firmware-a/next-checks.log'
-        # TODO: it is not possible to give this groovy script the
-        #       auth/permissions required to access next-checks.log
-        #       uncomment this once the job is made public
-        # - groovy-postbuild:
-        #     script:
-        #         !include-raw:
-        #           - tf-a-static-tfa-next/postbuild.groovy
+      - archive:
+          artifacts: trusted-firmware-a/next-checks.log
+    # TODO: it is not possible to give this groovy script the
+    #       auth/permissions required to access next-checks.log
+    #       uncomment this once the job is made public
+    # - groovy-postbuild:
+    #     script:
+    #         !include-raw:
+    #           - tf-a-static-tfa-next/postbuild.groovy
diff --git a/tf-a-test-category-visualization.yaml b/tf-a-test-category-visualization.yaml
index 25ab201..0cf4497 100644
--- a/tf-a-test-category-visualization.yaml
+++ b/tf-a-test-category-visualization.yaml
@@ -1,33 +1,32 @@
 - job:
     name: tf-a-test-category-visualization
-    description: >-
-      Generates a visualization of TFTF tests by their test group and category.
+    description: Generates a visualization of TFTF tests by their test group and category.
     node: docker-amd64-tf-a-jammy
     concurrent: true
     properties:
-    - build-discarder:
-        days-to-keep: 30
+      - build-discarder:
+          days-to-keep: 30
     parameters:
-    - string:
-        name: CI_REFSPEC
-        default: +refs/heads/master:refs/remotes/origin/master
-    - string:
-        name: JOBS_REFSPEC
-        default: 'refs/heads/master'
-        description: |
-          tf-a-job-configs refspec to use. The master branch is used by default.
-    - string:
-        name: FILTER
-        default:
-        description: Optional job/group filter string (e.g. <code>juno</code>).
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: FILTER
+          default:
+          description: Optional job/group filter string (e.g. <code>juno</code>).
     builders:
-    - shell: !include-raw: scripts/clone.sh
-    - shell: |
-        mkdir -p output
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          mkdir -p output
 
-        cd tf-a-ci-scripts &&
-          bash script/graphs/categorize-tests.bash ${FILTER} \
-            > ../output.png 2> ../output.tsv
+          cd tf-a-ci-scripts &&
+            bash script/graphs/categorize-tests.bash ${FILTER} \
+              > ../output.png 2> ../output.tsv
     publishers:
-    - archive:
-        artifacts: output.*
+      - archive:
+          artifacts: output.*
diff --git a/tf-a-test-result-visualization.yaml b/tf-a-test-result-visualization.yaml
index c003924..3d5e061 100644
--- a/tf-a-test-result-visualization.yaml
+++ b/tf-a-test-result-visualization.yaml
@@ -3,8 +3,7 @@
     node: docker-amd64-tf-a-jammy
     project-type: freestyle
     concurrent: true
-    description: >-
-      Generates a visualization of the test results from the current job.
+    description: Generates a visualization of the test results from the current job.
     disabled: false
     properties:
       - build-discarder:
@@ -12,34 +11,34 @@
     parameters:
       - string:
           name: TF_GERRIT_PROJECT
-          default: 'TF-A/trusted-firmware-a'
+          default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: 'refs/heads/integration'
+          default: refs/heads/integration
       - string:
           name: TF_GERRIT_REFSPEC
-          default: '+refs/heads/integration:refs/remotes/origin/integration'
+          default: +refs/heads/integration:refs/remotes/origin/integration
       - string:
           name: TFTF_GERRIT_PROJECT
-          default: 'TF-A/tf-a-tests'
+          default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 'refs/heads/master'
+          default: refs/heads/master
       - string:
           name: TFTF_GERRIT_REFSPEC
-          default: '+refs/heads/master:refs/remotes/origin/master'
+          default: +refs/heads/master:refs/remotes/origin/master
       - string:
           name: CI_REFSPEC
-          default: '+refs/heads/master:refs/remotes/origin/master'
+          default: +refs/heads/master:refs/remotes/origin/master
       - string:
           name: JOBS_REFSPEC
-          default: 'refs/heads/master'
+          default: refs/heads/master
           description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
       - string:
           name: TARGET_BUILD
-          default: 'tf-a-main/1'
-          description: 'Target build to analyze.'
+          default: tf-a-main/1
+          description: Target build to analyze.
     builders:
       - shell: !include-raw: scripts/clone.sh
       - shell: |
@@ -65,6 +64,5 @@
       - archive:
           artifacts: report.html, tf-a-main*.png, tf-a-main*.csv
       - groovy-postbuild:
-          script:
-            !include-raw:
-              - tf-a-ci-gateway/postbuild.groovy
+          script: !include-raw:
+            - tf-a-ci-gateway/postbuild.groovy
diff --git a/tf-a-tftf-docs-watcher.yaml b/tf-a-tftf-docs-watcher.yaml
index fce874d..28b8965 100644
--- a/tf-a-tftf-docs-watcher.yaml
+++ b/tf-a-tftf-docs-watcher.yaml
@@ -3,44 +3,40 @@
     node: docker-amd64-tf-a-jammy
     project-type: freestyle
     concurrent: false
-    description:
-      Triggers whenever a code change is merged into the master branch of the
-      TF-A-Tests repository. Executes a webhook to trigger the ReadTheDocs
-      service to build a fresh copy of the documentation for one or more
-      branches.
+    description: Triggers whenever a code change is merged into the master branch of the TF-A-Tests repository. Executes a webhook to trigger the ReadTheDocs service to build a fresh copy of the documentation for one or more branches.
     disabled: false
     builders:
-    - shell: |-
-        #!/bin/bash -e
-        echo "Notifying ReadTheDocs of changes on: $RTD_BRANCHES"
-        curl -X POST -d "branches=$RTD_BRANCHES" -d "token=$RTD_TOKEN" https://readthedocs.org/api/v2/webhook/trustedfirmware-a-tests/104345/
+      - shell: |-
+          #!/bin/bash -e
+          echo "Notifying ReadTheDocs of changes on: $RTD_BRANCHES"
+          curl -X POST -d "branches=$RTD_BRANCHES" -d "token=$RTD_TOKEN" https://readthedocs.org/api/v2/webhook/trustedfirmware-a-tests/104345/
     properties:
-    - build-discarder:
-        days-to-keep: 7
-        num-to-keep: 10
+      - build-discarder:
+          days-to-keep: 7
+          num-to-keep: 10
     triggers:
-    - gerrit:
-        silent: true
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: master
-          project-compare-type: PLAIN
-          project-pattern: 'TF-A/tf-a-tests'
-        trigger-on:
-        - ref-updated-event
+      - gerrit:
+          silent: true
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: master
+              project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+          trigger-on:
+            - ref-updated-event
     wrappers:
-    - timestamps
-    - credentials-binding:
-      - text:
-          credential-id: Trusted_Firmware_Tests_ReadTheDocs_Token
-          variable: RTD_TOKEN
+      - timestamps
+      - credentials-binding:
+          - text:
+              credential-id: Trusted_Firmware_Tests_ReadTheDocs_Token
+              variable: RTD_TOKEN
     parameters:
-    - string:
-        name: RTD_BRANCHES
-        default: master
-        description: |
-          The branch, or branches, to rebuild the documentation for.
+      - string:
+          name: RTD_BRANCHES
+          default: master
+          description: |
+            The branch, or branches, to rebuild the documentation for.
     publishers:
-    - workspace-cleanup
+      - workspace-cleanup
diff --git a/tf-a-tftf-gerrit-tforg-l1.yaml b/tf-a-tftf-gerrit-tforg-l1.yaml
index d64291f..b69418b 100644
--- a/tf-a-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-tftf-gerrit-tforg-l1.yaml
@@ -8,152 +8,150 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+1
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: '+refs/heads/master:refs/remotes/origin/master'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-           name: RMM_REFSPEC
-           default: '+refs/heads/main:refs/remotes/origin/main'
-           description: |
-             tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Build and static checks
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-static-checks
-          current-parameters: true
-          predefined-parameters: |-
-            REPO_UNDER_TEST=tf-a-tests
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run doc build check
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-check-docs
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Build TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-build
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Basic TF-A-Tests test cases
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |
-            TEST_GROUPS=tftf-l1-fvp
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Build and static checks
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-static-checks
+              current-parameters: true
+              predefined-parameters: REPO_UNDER_TEST=tf-a-tests
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run doc build check
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-check-docs
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Build TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-build
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Basic TF-A-Tests test cases
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |
+                TEST_GROUPS=tftf-l1-fvp
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 1
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/tf-a-tests
-            branches:
-            - branch-compare-type: PLAIN
-              branch-pattern: master
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 1
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: master
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-tftf-gerrit-tforg-l2.yaml b/tf-a-tftf-gerrit-tforg-l2.yaml
index 79d2af5..fea8150 100644
--- a/tf-a-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-tftf-gerrit-tforg-l2.yaml
@@ -8,153 +8,152 @@
       Job that triggers for every TF-A-Tests patch approved with the Allow-CI+2
       label on review.trustedfirmware.org.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
     parameters:
-        - string:
-            name: GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: GERRIT_PATCHSET_NUMBER
-            default: ''
-        - string:
-            name: GERRIT_CHANGE_NUMBER
-            default: ''
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-            description: "Git project branch for Trusted Firmware-A."
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-            description: "Git refspec for Trusted Firmware-A."
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: 'Parameter only used by the clone script'
-        - string:
-           name: SPM_REFSPEC
-           default: '+refs/heads/master:refs/remotes/origin/master'
-           description: |
-             SPM (Hafnium) refspec to use.
-        - string:
-           name: RMM_REFSPEC
-           default: '+refs/heads/main:refs/remotes/origin/main'
-           description: |
-             tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
+      - string:
+          name: GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: GERRIT_PATCHSET_NUMBER
+          default: ""
+      - string:
+          name: GERRIT_CHANGE_NUMBER
+          default: ""
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+          description: Git project branch for Trusted Firmware-A.
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+          description: Git refspec for Trusted Firmware-A.
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: Parameter only used by the clone script
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM (Hafnium) refspec to use.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
     wrappers:
       - credentials-binding:
           - ssh-user-private-key:
               credential-id: TFA_CI_BOT_USER_SSH_KEY
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
-              passphrase-variable: ''
+              passphrase-variable: ""
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > env.param
-        GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
-        GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
-        GERRIT_HOST=${GERRIT_HOST}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
-        TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        condition: COMPLETED
-        name: Carry out level 1 tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-tftf-gerrit-tforg-l1
-          current-parameters: true
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Firmware Update Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fwu
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run Level 2 testing of TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
-    - multijob:
-        condition: COMPLETED
-        name: Run extensive TF-A-Tests
-        projects:
-        - kill-phase-on: NEVER
-          name: tf-a-ci-gateway
-          current-parameters: true
-          predefined-parameters: |-
-            TEST_GROUPS=tftf-l2-extensive-tests-fvp
-            TFTF_REFSPEC=$GERRIT_REFSPEC
-          property-file: env.param
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > env.param
+          GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER}
+          GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER}
+          GERRIT_HOST=${GERRIT_HOST}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          TFTF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          TFTF_GERRIT_BRANCH=${GERRIT_BRANCH}
+          TFTF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          condition: COMPLETED
+          name: Carry out level 1 tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-tftf-gerrit-tforg-l1
+              current-parameters: true
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Firmware Update Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fwu
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run Level 2 testing of TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-juno tf-l2-boot-tests-spm-mm tftf-l2-fvp-dynamiq spm-l2-boot-tests
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
+      - multijob:
+          condition: COMPLETED
+          name: Run extensive TF-A-Tests
+          projects:
+            - kill-phase-on: NEVER
+              name: tf-a-ci-gateway
+              current-parameters: true
+              predefined-parameters: |-
+                TEST_GROUPS=tftf-l2-extensive-tests-fvp
+                TFTF_REFSPEC=$GERRIT_REFSPEC
+              property-file: env.param
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: master
-          project-compare-type: PLAIN
-          project-pattern: TF-A/tf-a-tests
-        trigger-on:
-          - comment-added-event:
-              approval-category: "Allow-CI"
-              approval-value: 2
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: master
+              project-compare-type: PLAIN
+              project-pattern: TF-A/tf-a-tests
+          trigger-on:
+            - comment-added-event:
+                approval-category: Allow-CI
+                approval-value: 2
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-tftf-main.yaml b/tf-a-tftf-main.yaml
index 05a1c3d..b3a3cbe 100644
--- a/tf-a-tftf-main.yaml
+++ b/tf-a-tftf-main.yaml
@@ -16,46 +16,46 @@
     parameters:
       - string:
           name: TF_GERRIT_PROJECT
-          default: "TF-A/trusted-firmware-a"
-          description: "Gerrit project name for Trusted Firmware-A."
+          default: TF-A/trusted-firmware-a
+          description: Gerrit project name for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_BRANCH
-          default: "refs/heads/integration"
-          description: "Git project branch for Trusted Firmware-A."
+          default: refs/heads/integration
+          description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
-          default: "+refs/heads/integration:refs/remotes/origin/integration"
-          description: "Git refspec for Trusted Firmware-A."
+          default: +refs/heads/integration:refs/remotes/origin/integration
+          description: Git refspec for Trusted Firmware-A.
       - string:
           name: TFTF_GERRIT_PROJECT
-          default: "TF-A/tf-a-tests"
-          description: "Gerrit project name for the Trusted Firmware-A Test Framework."
+          default: TF-A/tf-a-tests
+          description: Gerrit project name for the Trusted Firmware-A Test Framework.
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: "refs/heads/master"
-          description: "Git branch for the Trusted Firmware-A Test Framework."
+          default: refs/heads/master
+          description: Git branch for the Trusted Firmware-A Test Framework.
       - string:
           name: TFTF_GERRIT_REFSPEC
-          default: "+refs/heads/master:refs/remotes/origin/master"
-          description: "Git refspec for the Trusted Firmware-A Test Framework."
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: Git refspec for the Trusted Firmware-A Test Framework.
       - string:
           name: CI_REFSPEC
-          default: "+refs/heads/master:refs/remotes/origin/master"
-          description: "Git refspec for the Trusted Firmware-A CI scripts."
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: Git refspec for the Trusted Firmware-A CI scripts.
       - string:
           name: RMM_REFSPEC
-          default: '+refs/heads/main:refs/remotes/origin/main'
+          default: +refs/heads/main:refs/remotes/origin/main
           description: |
             tf-rmm refspec to use. The main branch is used by default.
       - string:
           name: JOBS_REFSPEC
-          default: 'refs/heads/master'
+          default: refs/heads/master
           description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
       - string:
           name: SHARE_FOLDER
-          default: "/srv/shared/${JOB_NAME}/${BUILD_NUMBER}"
-          description: "Folder containing shared repositories for downstream pipeline jobs."
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs.
     triggers:
       - timed: H H(0-6) * * 1-5
     wrappers:
@@ -68,8 +68,7 @@
       - workspace-cleanup
       - timestamps
     builders:
-      - shell:
-          !include-raw: scripts/clone.sh
+      - shell: !include-raw: scripts/clone.sh
       - shell: |
           #!/bin/bash
 
@@ -89,8 +88,7 @@
               kill-phase-on: NEVER
               name: tf-a-static-checks
               alias: tftf-static-checks
-              predefined-parameters: |-
-                REPO_UNDER_TEST=tf-a-tests
+              predefined-parameters: REPO_UNDER_TEST=tf-a-tests
               property-file: tf-a-tests-env.param
       - multijob:
           condition: COMPLETED
@@ -100,8 +98,7 @@
               kill-phase-on: NEVER
               name: tf-a-ci-gateway
               alias: tftf-l1-build
-              predefined-parameters: |-
-                TEST_GROUPS=tftf-l1-build
+              predefined-parameters: TEST_GROUPS=tftf-l1-build
               property-file: tf-a-tests-env.param
       - multijob:
           condition: COMPLETED
@@ -111,8 +108,7 @@
               kill-phase-on: NEVER
               name: tf-a-ci-gateway
               alias: tftf-l2-fwu
-              predefined-parameters: |-
-                TEST_GROUPS=tftf-l2-fwu
+              predefined-parameters: TEST_GROUPS=tftf-l2-fwu
               property-file: tf-a-tests-env.param
       - multijob:
           condition: COMPLETED
@@ -122,29 +118,25 @@
               kill-phase-on: NEVER
               name: tf-a-ci-gateway
               alias: tftf-l1-fvp tftf-l1-juno
-              predefined-parameters: |-
-                TEST_GROUPS=tftf-l1-fvp tftf-l1-juno
+              predefined-parameters: TEST_GROUPS=tftf-l1-fvp tftf-l1-juno
               property-file: tf-a-tests-env.param
             - current-parameters: true
               kill-phase-on: NEVER
               name: tf-a-ci-gateway
               alias: tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq
-              predefined-parameters: |-
-                TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq
+              predefined-parameters: TEST_GROUPS=tftf-l2-fvp-auxiliary tftf-l2-fvp-dynamiq
               property-file: tf-a-tests-env.param
             - current-parameters: true
               kill-phase-on: NEVER
               name: tf-a-ci-gateway
               alias: spm-l2-boot-tests tf-l2-boot-tests-spm-mm
-              predefined-parameters: |-
-                TEST_GROUPS=spm-l2-boot-tests tf-l2-boot-tests-spm-mm
+              predefined-parameters: TEST_GROUPS=spm-l2-boot-tests tf-l2-boot-tests-spm-mm
               property-file: tf-a-tests-env.param
             - current-parameters: true
               kill-phase-on: NEVER
               name: tf-a-ci-gateway
               alias: spm-l3-boot-tests tf-l3-boot-tests-spm-mm
-              predefined-parameters: |-
-                TEST_GROUPS=spm-l3-boot-tests tf-l3-boot-tests-spm-mm
+              predefined-parameters: TEST_GROUPS=spm-l3-boot-tests tf-l3-boot-tests-spm-mm
               property-file: tf-a-tests-env.param
       - multijob:
           condition: SUCCESSFUL
@@ -154,6 +146,5 @@
               kill-phase-on: FAILURE
               name: tf-a-ci-gateway
               alias: tftf-l2-extensive-tests-fvp
-              predefined-parameters: |-
-                TEST_GROUPS=tftf-l2-extensive-tests-fvp
+              predefined-parameters: TEST_GROUPS=tftf-l2-extensive-tests-fvp
               property-file: tf-a-tests-env.param
diff --git a/tf-a-tlc-pipeline.yaml b/tf-a-tlc-pipeline.yaml
index 8a0c913..0cc368a 100644
--- a/tf-a-tlc-pipeline.yaml
+++ b/tf-a-tlc-pipeline.yaml
@@ -6,33 +6,31 @@
     project-type: pipeline
     sandbox: true
     dsl: !include-raw: tf-a-tlc-pipeline/Jenkinsfile
-
     properties:
       - build-discarder:
           days-to-keep: 14
-
     triggers:
-    - gerrit:
-        server-name: review.trustedfirmware.org
-        trigger-on:
-          - patchset-created-event
-        projects:
-          - project-compare-type: PLAIN
-            project-pattern: TF-A/trusted-firmware-a
-            file-paths:
-              - compare-type: "ANT"
-                pattern: "tools/tlc/**"
-            branches:
-              - branch-compare-type: PLAIN
-                branch-pattern: integration
-        override-votes: true
-        gerrit-build-started-verified-value: 0
-        gerrit-build-successful-verified-value: 1
-        gerrit-build-failed-verified-value: -1
-        gerrit-build-unstable-verified-value: -1
-        gerrit-build-notbuilt-verified-value: 0
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          trigger-on:
+            - patchset-created-event
+          projects:
+            - project-compare-type: PLAIN
+              project-pattern: TF-A/trusted-firmware-a
+              file-paths:
+                - compare-type: ANT
+                  pattern: tools/tlc/**
+              branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: integration
+          override-votes: true
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: -1
+          gerrit-build-unstable-verified-value: -1
+          gerrit-build-notbuilt-verified-value: 0
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
diff --git a/tf-a-unsafe-tfa-next.yaml b/tf-a-unsafe-tfa-next.yaml
index 2908d92..e97b663 100644
--- a/tf-a-unsafe-tfa-next.yaml
+++ b/tf-a-unsafe-tfa-next.yaml
@@ -7,18 +7,18 @@
     defaults: global
     description: Check for Unsafe changes in Trusted Firmware Next
     properties:
-        - build-discarder:
-            days-to-keep: 14
+      - build-discarder:
+          days-to-keep: 14
     triggers:
-    - gerrit:
-        server-name: 'review.trustedfirmware.org'
-        projects:
-        - branches:
-          - branch-compare-type: PLAIN
-            branch-pattern: 'main'
-          project-compare-type: PLAIN
-          project-pattern: 'RF-A/rusted-firmware-a'
-        trigger-on:
+      - gerrit:
+          server-name: review.trustedfirmware.org
+          projects:
+            - branches:
+                - branch-compare-type: PLAIN
+                  branch-pattern: main
+              project-compare-type: PLAIN
+              project-pattern: RF-A/rusted-firmware-a
+          trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
                 exclude-trivial-rebase: false
@@ -26,100 +26,99 @@
                 exclude-private: true
                 exclude-wip: true
             - comment-added-contains-event:
-                comment-contains-value: '^RUN_UNSAFE_CI$'
-        override-votes: true
-        # without explicitly setting these values to 0, the plugin will by
-        # default leave Code Review votes
-        gerrit-build-started-codereview-value: 0
-        gerrit-build-successful-codereview-value: 0
-        gerrit-build-failed-codereview-value: 0
-        gerrit-build-unstable-codereview-value: 0
-        gerrit-build-notbuilt-codereview-value: 0
-        silent: false
-        silent-start: false
+                comment-contains-value: ^RUN_UNSAFE_CI$
+          override-votes: true
+          # without explicitly setting these values to 0, the plugin will by
+          # default leave Code Review votes
+          gerrit-build-started-codereview-value: 0
+          gerrit-build-successful-codereview-value: 0
+          gerrit-build-failed-codereview-value: 0
+          gerrit-build-unstable-codereview-value: 0
+          gerrit-build-notbuilt-codereview-value: 0
+          silent: false
+          silent-start: false
     parameters:
-        # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
-        # patchset - defaults below are for manual triggers
-        - string:
-            name: GERRIT_PROJECT
-            default: 'RF-A/rusted-firmware-a'
-        - string:
-            name: GERRIT_BRANCH
-            default: 'refs/heads/main'
-        - string:
-            name: GERRIT_REFSPEC
-            default: '+refs/heads/main:refs/remotes/origin/main'
-            description: |
-              'e.g. refs/changes/13/31138/1'
-        - string:
-            name: RF_GERRIT_REFSPEC
-            default: ${GERRIT_REFSPEC}
-            description: |
-              'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/tfa-next:refs/remotes/origin/tfa-next'
-            description: |
-              'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs'
-        - string:
-            name: CLONE_REPOS
-            default: "rusted-firmware-a"
-            description: |
-              Optional arg to clone only specific projects from default list (tf-a-ci-scripts,rusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
-        - string:
-            name: FETCH_SSH
-            default: 1
-            description: |
-              Fetch branches with authenticated SSH instead of anonymous HTTPS
+      # GERRIT_{PROJECT,BRANCH,REFSPEC} are set when triggered by a Gerrit
+      # patchset - defaults below are for manual triggers
+      - string:
+          name: GERRIT_PROJECT
+          default: RF-A/rusted-firmware-a
+      - string:
+          name: GERRIT_BRANCH
+          default: refs/heads/main
+      - string:
+          name: GERRIT_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            'e.g. refs/changes/13/31138/1'
+      - string:
+          name: RF_GERRIT_REFSPEC
+          default: ${GERRIT_REFSPEC}
+          description: |
+            'do-not-amend: used by scripts/clone.sh to fetch the correct Gerrit patchset - use GERRIT_REFSPEC instead'
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/tfa-next:refs/remotes/origin/tfa-next
+          description: |
+            'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs
+      - string:
+          name: CLONE_REPOS
+          default: rusted-firmware-a
+          description: |
+            Optional arg to clone only specific projects from default list (tf-a-ci-scripts,rusted-firmware-a,tf-a-tests,spm,tf-m-tests,tf-m-extras)
+      - string:
+          name: FETCH_SSH
+          default: 1
+          description: |
+            Fetch branches with authenticated SSH instead of anonymous HTTPS
     wrappers:
-        - credentials-binding:
-            - ssh-user-private-key:
-                credential-id: TFA_CI_BOT_USER_SSH_KEY
-                key-file-variable: CI_BOT_KEY
-                username-variable: CI_BOT_USERNAME
-                passphrase-variable: ''
-        - timestamps
-        - timeout:
-            timeout: 240
-            fail: true
+      - credentials-binding:
+          - ssh-user-private-key:
+              credential-id: TFA_CI_BOT_USER_SSH_KEY
+              key-file-variable: CI_BOT_KEY
+              username-variable: CI_BOT_USERNAME
+              passphrase-variable: ""
+      - timestamps
+      - timeout:
+          timeout: 240
+          fail: true
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -ex
-        cat << EOF > tf-a-env.param
-        RF_GERRIT_PROJECT=${GERRIT_PROJECT}
-        RF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -ex
+          cat << EOF > tf-a-env.param
+          RF_GERRIT_PROJECT=${GERRIT_PROJECT}
+          RF_GERRIT_REFSPEC=${GERRIT_REFSPEC}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
 
-        cd ${WORKSPACE}/rusted-firmware-a
+          cd ${WORKSPACE}/rusted-firmware-a
 
-        # Vote Unsafe-Review+1 on patches not touching any unsafe code
+          # Vote Unsafe-Review+1 on patches not touching any unsafe code
 
-        # 1. Check if the patch touches unsafe code:
+          # 1. Check if the patch touches unsafe code:
 
-        # if the grep command finds nothing, it will exit 1 and because we have set -e the program
-        # will fail. Doing || true makes it so that the final exit command is always 0 so the flow is not
-        # interrupted and we can check `diff` to know if the program was successful or not.
-        diff=$(echo $(git show -U10 --format=) | grep "unsafe" || true)
-        if [ "$diff" != "" ]; then
-            exit 1
-        fi
+          # if the grep command finds nothing, it will exit 1 and because we have set -e the program
+          # will fail. Doing || true makes it so that the final exit command is always 0 so the flow is not
+          # interrupted and we can check `diff` to know if the program was successful or not.
+          diff=$(echo $(git show -U10 --format=) | grep "unsafe" || true)
+          if [ "$diff" != "" ]; then
+              exit 1
+          fi
 
-        # 2. Cast the Unsafe-Review +1 vote if the patch does NOT touch unsafe code:
+          # 2. Cast the Unsafe-Review +1 vote if the patch does NOT touch unsafe code:
 
-        SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa -p 29418 -i ${CI_BOT_KEY}"
-        GERRIT_URL="review.trustedfirmware.org"
-        SET_SAFE_CMD="${SSH_PARAMS} ${CI_BOT_USERNAME}@${GERRIT_URL} gerrit review --label Unsafe-Review=1 -m Safe"
-        ssh ${SET_SAFE_CMD} ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER}
+          SSH_PARAMS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa -p 29418 -i ${CI_BOT_KEY}"
+          GERRIT_URL="review.trustedfirmware.org"
+          SET_SAFE_CMD="${SSH_PARAMS} ${CI_BOT_USERNAME}@${GERRIT_URL} gerrit review --label Unsafe-Review=1 -m Safe"
+          ssh ${SET_SAFE_CMD} ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER}
diff --git a/tf-a-weekly.yaml b/tf-a-weekly.yaml
index 01d0ba6..2cf1559 100644
--- a/tf-a-weekly.yaml
+++ b/tf-a-weekly.yaml
@@ -6,109 +6,108 @@
     disabled: false
     description: Main CI job for Trusted Firmware.
     properties:
-    - throttle:
-        option: project
-        enabled: true
-        max-total: 5
-    - build-discarder:
-        days-to-keep: 14
-        num-to-keep: 60
+      - throttle:
+          option: project
+          enabled: true
+          max-total: 5
+      - build-discarder:
+          days-to-keep: 14
+          num-to-keep: 60
     parameters:
-        - string:
-            name: TF_GERRIT_PROJECT
-            default: 'TF-A/trusted-firmware-a'
-        - string:
-            name: TF_GERRIT_BRANCH
-            default: 'refs/heads/integration'
-        - string:
-            name: TF_GERRIT_REFSPEC
-            default: '+refs/heads/integration:refs/remotes/origin/integration'
-        - string:
-            name: TFTF_GERRIT_PROJECT
-            default: 'TF-A/tf-a-tests'
-        - string:
-            name: TFTF_GERRIT_BRANCH
-            default: 'refs/heads/master'
-        - string:
-            name: TFTF_GERRIT_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-           name: SPM_REFSPEC
-           default: '+refs/heads/master:refs/remotes/origin/master'
-           description: |
-             SPM(Hafnium) refspec to use. The master branch is used by default.
-        - string:
-           name: RMM_REFSPEC
-           default: '+refs/heads/main:refs/remotes/origin/main'
-           description: |
-             tf-rmm refspec to use. The main branch is used by default.
-        - string:
-            name: CI_REFSPEC
-            default: '+refs/heads/master:refs/remotes/origin/master'
-        - string:
-            name: JOBS_REFSPEC
-            default: 'refs/heads/master'
-            description: |
-              tf-a-job-configs refspec to use. The master branch is used by default.
-        - string:
-            name: LAVA_PRIORITY
-            default: 'low'
-        - string:
-            name: MBEDTLS_URL
-            default: 'https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz'
-        - string:
-            name: LAVA_RETRIES
-            default: 2
-            description: |
-              Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
-        - string:
-            name: USE_TUXSUITE_FVP
-            default: 1
-            description: |
-              Whether to submit FVP tests via TuxSuite (instead of LAVA)
-        - string:
-            name: SHARE_FOLDER
-            default: '/srv/shared/${JOB_NAME}/${BUILD_NUMBER}'
-            description: 'Folder containing shared repositories for downstream pipeline jobs.'
+      - string:
+          name: TF_GERRIT_PROJECT
+          default: TF-A/trusted-firmware-a
+      - string:
+          name: TF_GERRIT_BRANCH
+          default: refs/heads/integration
+      - string:
+          name: TF_GERRIT_REFSPEC
+          default: +refs/heads/integration:refs/remotes/origin/integration
+      - string:
+          name: TFTF_GERRIT_PROJECT
+          default: TF-A/tf-a-tests
+      - string:
+          name: TFTF_GERRIT_BRANCH
+          default: refs/heads/master
+      - string:
+          name: TFTF_GERRIT_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: SPM_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+          description: |
+            SPM(Hafnium) refspec to use. The master branch is used by default.
+      - string:
+          name: RMM_REFSPEC
+          default: +refs/heads/main:refs/remotes/origin/main
+          description: |
+            tf-rmm refspec to use. The main branch is used by default.
+      - string:
+          name: CI_REFSPEC
+          default: +refs/heads/master:refs/remotes/origin/master
+      - string:
+          name: JOBS_REFSPEC
+          default: refs/heads/master
+          description: |
+            tf-a-job-configs refspec to use. The master branch is used by default.
+      - string:
+          name: LAVA_PRIORITY
+          default: low
+      - string:
+          name: MBEDTLS_URL
+          default: https://github.com/Mbed-TLS/mbedtls/archive/mbedtls-3.6.3.tar.gz
+      - string:
+          name: LAVA_RETRIES
+          default: 2
+          description: |
+            Number of tries submitting job to LAVA in case it fails (stopgap measure against nondeterministic failures)
+      - string:
+          name: USE_TUXSUITE_FVP
+          default: 1
+          description: |
+            Whether to submit FVP tests via TuxSuite (instead of LAVA)
+      - string:
+          name: SHARE_FOLDER
+          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          description: Folder containing shared repositories for downstream pipeline jobs.
     wrappers:
       - workspace-cleanup
       - timestamps
     builders:
-    - shell:
-        !include-raw: scripts/clone.sh
-    - shell: |
-        #!/bin/bash
-        set -e
-        cat << EOF > tf-a-env.param
-        GERRIT_PROJECT=${TF_GERRIT_PROJECT}
-        GERRIT_BRANCH=${TF_GERRIT_BRANCH}
-        GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-        cat << EOF > tf-a-tests-env.param
-        GERRIT_PROJECT=${TFTF_GERRIT_PROJECT}
-        GERRIT_BRANCH=${TFTF_GERRIT_BRANCH}
-        GERRIT_REFSPEC=${TFTF_GERRIT_REFSPEC}
-        QA_SERVER_PROJECT=${JOB_NAME}
-        QA_SERVER_VERSION=${BUILD_NUMBER}
-        SHARE_FOLDER=${SHARE_FOLDER}
-        EOF
-    - multijob:
-        name: TFTF Fuzzing
-        condition: COMPLETED
-        projects:
-        - name: tf-a-ci-gateway
-          alias: tf-l3-fuzzing SDEI
-          current-parameters: true
-          kill-phase-on: NEVER
-          predefined-parameters: TEST_GROUPS=tf-l3-fuzzing
-          property-file: tf-a-tests-env.param
-    # participate in the job's success/failure.
-    - trigger-builds:
-        - project: tf-a-ci-coverage-gateway
-          block: true
-          current-parameters: true
+      - shell: !include-raw: scripts/clone.sh
+      - shell: |
+          #!/bin/bash
+          set -e
+          cat << EOF > tf-a-env.param
+          GERRIT_PROJECT=${TF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+          cat << EOF > tf-a-tests-env.param
+          GERRIT_PROJECT=${TFTF_GERRIT_PROJECT}
+          GERRIT_BRANCH=${TFTF_GERRIT_BRANCH}
+          GERRIT_REFSPEC=${TFTF_GERRIT_REFSPEC}
+          QA_SERVER_PROJECT=${JOB_NAME}
+          QA_SERVER_VERSION=${BUILD_NUMBER}
+          SHARE_FOLDER=${SHARE_FOLDER}
+          EOF
+      - multijob:
+          name: TFTF Fuzzing
+          condition: COMPLETED
+          projects:
+            - name: tf-a-ci-gateway
+              alias: tf-l3-fuzzing SDEI
+              current-parameters: true
+              kill-phase-on: NEVER
+              predefined-parameters: TEST_GROUPS=tf-l3-fuzzing
+              property-file: tf-a-tests-env.param
+      # participate in the job's success/failure.
+      - trigger-builds:
+          - project: tf-a-ci-coverage-gateway
+            block: true
+            current-parameters: true
     triggers:
-        - timed: '59 23 * * 7'
+      - timed: 59 23 * * 7
diff --git a/tf-a-windows-builder.yaml b/tf-a-windows-builder.yaml
index 3aab760..39a9f2f 100644
--- a/tf-a-windows-builder.yaml
+++ b/tf-a-windows-builder.yaml
@@ -19,14 +19,16 @@
       - axis:
           name: DEBUG
           type: user-defined
-          values: ['0', '1']
+          values:
+            - "0"
+            - "1"
       - axis:
           name: label
           type: slave
           values:
             - tf-a-windows
     builders:
-      - shell:  |
+      - shell: |
           #!C:\msys64\usr\bin\env.exe OSTYPE="msys" bash -x
           make -j $(nproc) CROSS_COMPILE=aarch64-none-elf- PLAT=fvp DEBUG=$DEBUG V=1 all
     parameters: