diff --git a/generic-lib-testing.yaml b/generic-lib-testing.yaml
index 7c60134..e32f7b5 100644
--- a/generic-lib-testing.yaml
+++ b/generic-lib-testing.yaml
@@ -31,7 +31,7 @@
             Fetch branches with authenticated SSH instead of anonymous HTTPS
       - string:
           name: GERRIT_BRANCH
-          default: main
+          default: +refs/heads/main:refs/remotes/origin/main
       - string:
           name: CLONE_REPOS
           default: tf-a-ci-scripts,rusted-firmware-a
diff --git a/rf-a-main.yaml b/rf-a-main.yaml
index 97d7c61..f844c88 100644
--- a/rf-a-main.yaml
+++ b/rf-a-main.yaml
@@ -21,7 +21,7 @@
           default: RF-A/rusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: main
+          default: refs/heads/main
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/main:refs/remotes/origin/main
@@ -43,17 +43,20 @@
           description: |
             'Refs to fetch for the tf-a-ci-scripts repo e.g. refs/changes/13/31138/1'
       - string:
+          name: JOBS_PROJECT
+          default: ci/tf-a-job-configs.git
+      - 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}
+          default: /srv/shared/staging/${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,rusted-firmware-a
+          default: tf-a-job-configs,tf-a-ci-scripts,trusted-firmware-a,rusted-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:
@@ -78,6 +81,7 @@
           cat << EOF > tf-a-env.param
           RF_GERRIT_PROJECT=${GERRIT_PROJECT}
           RFA_REFSPEC=${RFA_REFSPEC}
+          GERRIT_REFSPEC=${GERRIT_REFSPEC}
           GERRIT_BRANCH=${GERRIT_BRANCH}
           TF_GERRIT_PROJECT=TF-A/trusted-firmware-a
           TF_GERRIT_REFSPEC=${TF_GERRIT_REFSPEC}
@@ -100,6 +104,10 @@
             - name: rf-a-static
               current-parameters: true
               kill-phase-on: NEVER
+              predefined-parameters: |
+                GERRIT_BRANCH=${GERRIT_BRANCH}
+                RFA_REFSPEC=${RFA_REFSPEC}
+                GERRIT_REFSPEC=${GERRIT_REFSPEC}
               property-file: tf-a-env.param
       - multijob:
           name: Platform independent tests
@@ -112,6 +120,7 @@
                 TEST_REPO_NAME=rusted-firmware-a
                 TEST_REPO_PROJECT=RF-A
                 RFA_REFSPEC=$RFA_REFSPEC
+                GERRIT_REFSPEC=${GERRIT_REFSPEC}
               property-file: tf-a-env.param
       - multijob:
           name: Build Rusted Firmware A
diff --git a/rf-a-static.yaml b/rf-a-static.yaml
index 9048ae5..e785ac5 100644
--- a/rf-a-static.yaml
+++ b/rf-a-static.yaml
@@ -22,11 +22,14 @@
           name: GERRIT_BRANCH
           default: main
       - string:
+          name: GERRIT_REFSPEC
+          default: refs/heads/main
+      - string:
           name: TF_GERRIT_PROJECT
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: TF_GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
@@ -39,12 +42,15 @@
           description: |
             tf-a-job-configs refspec to use. The master branch is used by default.
       - string:
+          name: JOBS_PROJECT
+          default: ci/tf-a-job-configs.git
+      - string:
           name: SHARE_FOLDER
-          default: /srv/shared/${JOB_NAME}/${BUILD_NUMBER}
+          default: /srv/shared/staging/${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,rusted-firmware-a
+          default: tf-a-job-configs,tf-a-ci-scripts,rusted-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:
@@ -70,6 +76,7 @@
           set -e
           cat << EOF > env.param
           RFA_REFSPEC=${RFA_REFSPEC}
+          GERRIT_REFSPEC=${GERRIT_REFSPEC}
           GERRIT_BRANCH=${GERRIT_BRANCH}
           EOF
           cd ${WORKSPACE}/rusted-firmware-a
diff --git a/rf-a-unsafe.yaml b/rf-a-unsafe.yaml
index edbaff5..d38b004 100644
--- a/rf-a-unsafe.yaml
+++ b/rf-a-unsafe.yaml
@@ -40,11 +40,11 @@
             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}
+          default: /srv/shared/staging/${JOB_NAME}/${BUILD_NUMBER}
           description: Folder containing shared repositories for downstream pipeline jobs
       - string:
           name: CLONE_REPOS
-          default: rusted-firmware-a
+          default: tf-a-ci-scripts,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:
@@ -59,6 +59,7 @@
               key-file-variable: CI_BOT_KEY
               username-variable: CI_BOT_USERNAME
               passphrase-variable: ""
+      - workspace-cleanup
       - timestamps
       - timeout:
           timeout: 240
diff --git a/scripts/clone.sh b/scripts/clone.sh
index a1ab685..465c0e6 100755
--- a/scripts/clone.sh
+++ b/scripts/clone.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2021-2023 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2025 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -29,6 +29,10 @@
 
 # Global defaults
 CLONE_REPOS=${CLONE_REPOS:-trusted-firmware-a,tf-a-ci-scripts,tf-a-tests,tf-m-extras,tf-m-tests,tf-rmm,spm}
+REFSPEC_MASTER="refs/heads/master"
+REFSPEC_MAIN="refs/heads/main"
+REFSPEC_TF_M_TESTS="refs/heads/tfa_ci_dep_revision"
+REFSPEC_TF_M_EXTRAS="refs/heads/tfa_ci_dep_revision"
 GIT_REPO="https://git.trustedfirmware.org"
 GERRIT_HOST="https://review.trustedfirmware.org"
 GIT_CLONE_PARAMS=""
@@ -53,62 +57,44 @@
 ARM_FW_DEV_GUIDE_GERRIT_PROJECT="${ARM_FW_DEV_GUIDE_GERRIT_PROJECT:-rust-spmc/firmware-development-guide}"
 JOBS_PROJECT="${JOBS_PROJECT:-ci/tf-a-job-configs.git}"
 
-# Default base branches
-TF_GERRIT_BRANCH="${TF_GERRIT_BRANCH:-master}"
-TFTF_GERRIT_BRANCH="${TFTF_GERRIT_BRANCH:-master}"
-SPM_BRANCH="${SPM_BRANCH:-master}"
-RMM_BRANCH="${RMM_BRANCH:-main}"
-TF_M_TESTS_GERRIT_BRANCH="${TF_M_TESTS_GERRIT_BRANCH:-tfa_ci_dep_revision}"
-TF_M_EXTRAS_GERRIT_BRANCH="${TF_M_EXTRAS_GERRIT_BRANCH:-tfa_ci_dep_revision}"
-CI_BRANCH="${CI_BRANCH:-master}"
-RFA_BRANCH="${RFA_BRANCH:-main}"
-ARM_FFA_GERRIT_BRANCH="${ARM_FFA_GERRIT_BRANCH:-main}"
-ARM_PL011_UART_GERRIT_BRANCH="${ARM_PL011_UART_GERRIT_BRANCH:-main}"
-ARM_PSCI_GERRIT_BRANCH="${ARM_PSCI_GERRIT_BRANCH:-main}"
-ARM_FVP_BASE_PAC_GERRIT_BRANCH="${ARM_FVP_BASE_PAC_GERRIT_BRANCH:-main}"
-ARM_SP805_GERRIT_BRANCH="${ARM_SP805_GERRIT_BRANCH:-main}"
-ARM_XLAT_GERRIT_BRANCH="${ARM_XLAT_GERRIT_BRANCH:-main}"
-ARM_FW_DEV_GUIDE_GERRIT_BRANCH="${ARM_FW_DEV_GUIDE_GERRIT_BRANCH:-main}"
-JOBS_BRANCH="${JOBS_BRANCH:-master}"
-
 # Default Reference specs
-TF_GERRIT_REFSPEC="${TF_GERRIT_REFSPEC:-refs/heads/${TF_GERRIT_BRANCH}}"
-TFTF_GERRIT_REFSPEC="${TFTF_GERRIT_REFSPEC:-refs/heads/${TFTF_GERRIT_BRANCH}}"
-SPM_REFSPEC="${SPM_REFSPEC:-refs/heads/${SPM_BRANCH}}"
-RMM_REFSPEC="${RMM_REFSPEC:-refs/heads/${RMM_BRANCH}}"
-TF_M_TESTS_GERRIT_REFSPEC="${TF_M_TESTS_GERRIT_REFSPEC:-refs/heads/${TF_M_TESTS_GERRIT_BRANCH}}"
-TF_M_EXTRAS_GERRIT_REFSPEC="${TF_M_EXTRAS_GERRIT_REFSPEC:-refs/heads/${TF_M_EXTRAS_GERRIT_BRANCH}}"
-CI_REFSPEC="${CI_REFSPEC:-refs/heads/${CI_BRANCH}}"
-RFA_REFSPEC="${RFA_REFSPEC:-refs/heads/${RFA_BRANCH}}"
-ARM_FFA_GERRIT_REFSPEC="${ARM_FFA_GERRIT_REFSPEC:-refs/heads/${ARM_FFA_GERRIT_BRANCH}}"
-ARM_PL011_UART_GERRIT_REFSPEC="${ARM_PL011_UART_GERRIT_REFSPEC:-refs/heads/${ARM_PL011_UART_GERRIT_BRANCH}}"
-ARM_PSCI_GERRIT_REFSPEC="${ARM_PSCI_GERRIT_REFSPEC:-refs/heads/${ARM_PSCI_GERRIT_BRANCH}}"
-ARM_FVP_BASE_PAC_GERRIT_REFSPEC="${ARM_FVP_BASE_PAC_GERRIT_REFSPEC:-refs/heads/${ARM_FVP_BASE_PAC_GERRIT_BRANCH}}"
-ARM_SP805_GERRIT_REFSPEC="${ARM_SP805_GERRIT_REFSPEC:-refs/heads/${ARM_SP805_GERRIT_BRANCH}}"
-ARM_XLAT_GERRIT_REFSPEC="${ARM_XLAT_GERRIT_REFSPEC:-refs/heads/${ARM_XLAT_GERRIT_BRANCH}}"
-ARM_FW_DEV_GUIDE_GERRIT_REFSPEC="${ARM_FW_DEV_GUIDE_GERRIT_REFSPEC:-refs/heads/${ARM_FW_DEV_GUIDE_GERRIT_BRANCH}}"
-JOBS_REFSPEC="${JOBS_REFSPEC:-refs/heads/${JOBS_BRANCH}}"
+TF_GERRIT_REFSPEC="${TF_GERRIT_REFSPEC:-${REFSPEC_MASTER}}"
+TFTF_GERRIT_REFSPEC="${TFTF_GERRIT_REFSPEC:-${REFSPEC_MASTER}}"
+SPM_REFSPEC="${SPM_REFSPEC:-${REFSPEC_MASTER}}"
+RMM_REFSPEC="${RMM_REFSPEC:-${REFSPEC_MAIN}}"
+TF_M_TESTS_GERRIT_REFSPEC="${TF_M_TESTS_GERRIT_REFSPEC:-${REFSPEC_TF_M_TESTS}}"
+TF_M_EXTRAS_GERRIT_REFSPEC="${TF_M_EXTRAS_GERRIT_REFSPEC:-${REFSPEC_TF_M_EXTRAS}}"
+CI_REFSPEC="${CI_REFSPEC:-${REFSPEC_MASTER}}"
+RFA_REFSPEC="${RFA_REFSPEC:-${REFSPEC_MAIN}}"
+ARM_FFA_GERRIT_REFSPEC="${ARM_FFA_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
+ARM_PL011_UART_GERRIT_REFSPEC="${ARM_PL011_UART_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
+ARM_PSCI_GERRIT_REFSPEC="${ARM_PSCI_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
+ARM_FVP_BASE_PAC_GERRIT_REFSPEC="${ARM_FVP_BASE_PAC_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
+ARM_SP805_GERRIT_REFSPEC="${ARM_SP805_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
+ARM_XLAT_GERRIT_REFSPEC="${ARM_XLAT_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
+ARM_FW_DEV_GUIDE_GERRIT_REFSPEC="${ARM_FW_DEV_GUIDE_GERRIT_REFSPEC:-${REFSPEC_MAIN}}"
+JOBS_REFSPEC="${JOBS_REFSPEC:-${REFSPEC_MASTER}}"
 
 JOBS_REPO_NAME="tf-a-job-configs"
 
 # Array containing "<repo host>;<project>;<repo name>;<refspec>" elements
 declare -A repos_map=(
-  ["tf-a-ci-scripts"]="${GERRIT_HOST};${CI_GERRIT_PROJECT};${CI_BRANCH};${CI_REFSPEC}"
-  ["trusted-firmware-a"]="${GERRIT_HOST};${TF_GERRIT_PROJECT};${TF_GERRIT_BRANCH};${TF_GERRIT_REFSPEC}"
-  ["tf-a-tests"]="${GERRIT_HOST};${TFTF_GERRIT_PROJECT};${TFTF_GERRIT_BRANCH};${TFTF_GERRIT_REFSPEC}"
-  ["spm"]="${GERRIT_HOST};${SPM_GERRIT_PROJECT};${SPM_BRANCH};${SPM_REFSPEC}"
-  ["tf-rmm"]="${GERRIT_HOST};${RMM_GERRIT_PROJECT};${RMM_BRANCH};${RMM_REFSPEC}"
-  ["tf-m-tests"]="${GERRIT_HOST};${TF_M_TESTS_GERRIT_PROJECT};${TF_M_TESTS_GERRIT_BRANCH};${TF_M_TESTS_GERRIT_REFSPEC}"
-  ["tf-m-extras"]="${GERRIT_HOST};${TF_M_EXTRAS_GERRIT_PROJECT};${TF_M_EXTRAS_GERRIT_BRANCH};${TF_M_EXTRAS_GERRIT_REFSPEC}"
-  ["rusted-firmware-a"]="${GERRIT_HOST};${RF_GERRIT_PROJECT};${RFA_BRANCH};${RFA_REFSPEC}"
-  ["arm-ffa"]="${GERRIT_HOST};${ARM_FFA_GERRIT_PROJECT};${ARM_FFA_GERRIT_BRANCH};${ARM_FFA_GERRIT_REFSPEC}"
-  ["arm-pl011-uart"]="${GERRIT_HOST};${ARM_PL011_UART_GERRIT_PROJECT};${ARM_PL011_UART_GERRIT_BRANCH};${ARM_PL011_UART_GERRIT_REFSPEC}"
-  ["arm-psci"]="${GERRIT_HOST};${ARM_PSCI_GERRIT_PROJECT};${ARM_PSCI_GERRIT_BRANCH};${ARM_PSCI_GERRIT_REFSPEC}"
-  ["arm-gic"]="${GERRIT_HOST};${ARM_GIC_GERRIT_PROJECT};${ARM_GIC_GERRIT_BRANCH};${ARM_GIC_GERRIT_REFSPEC}"
-  ["arm-fvp-base-pac"]="${GERRIT_HOST};${ARM_FVP_BASE_PAC_GERRIT_PROJECT};${ARM_FVP_BASE_PAC_GERRIT_BRANCH};${ARM_FVP_BASE_PAC_GERRIT_REFSPEC}"
-  ["arm-sp805"]="${GERRIT_HOST};${ARM_SP805_GERRIT_PROJECT};${ARM_SP805_GERRIT_BRANCH};${ARM_SP805_GERRIT_REFSPEC}"
-  ["arm-xlat"]="${GERRIT_HOST};${ARM_XLAT_GERRIT_PROJECT};${ARM_XLAT_GERRIT_BRANCH};${ARM_XLAT_GERRIT_REFSPEC}"
-  ["firmware-development-guide"]="${GERRIT_HOST};${ARM_FW_DEV_GUIDE_GERRIT_PROJECT};${ARM_FW_DEV_GUIDE_BRANCH};${ARM_FW_DEV_GUIDE_REFSPEC}"
+  ["tf-a-ci-scripts"]="${GERRIT_HOST};${CI_GERRIT_PROJECT};${CI_REFSPEC}"
+  ["trusted-firmware-a"]="${GERRIT_HOST};${TF_GERRIT_PROJECT};${TF_GERRIT_REFSPEC}"
+  ["tf-a-tests"]="${GERRIT_HOST};${TFTF_GERRIT_PROJECT};${TFTF_GERRIT_REFSPEC}"
+  ["spm"]="${GERRIT_HOST};${SPM_GERRIT_PROJECT};${SPM_REFSPEC}"
+  ["tf-rmm"]="${GERRIT_HOST};${RMM_GERRIT_PROJECT};${RMM_REFSPEC}"
+  ["tf-m-tests"]="${GERRIT_HOST};${TF_M_TESTS_GERRIT_PROJECT};${TF_M_TESTS_GERRIT_REFSPEC}"
+  ["tf-m-extras"]="${GERRIT_HOST};${TF_M_EXTRAS_GERRIT_PROJECT};${TF_M_EXTRAS_GERRIT_REFSPEC}"
+  ["rusted-firmware-a"]="${GERRIT_HOST};${RF_GERRIT_PROJECT};${RFA_REFSPEC}"
+  ["arm-ffa"]="${GERRIT_HOST};${ARM_FFA_GERRIT_PROJECT};${ARM_FFA_GERRIT_REFSPEC}"
+  ["arm-pl011-uart"]="${GERRIT_HOST};${ARM_PL011_UART_GERRIT_PROJECT};${ARM_PL011_UART_GERRIT_REFSPEC}"
+  ["arm-psci"]="${GERRIT_HOST};${ARM_PSCI_GERRIT_PROJECT};${ARM_PSCI_GERRIT_REFSPEC}"
+  ["arm-gic"]="${GERRIT_HOST};${ARM_GIC_GERRIT_PROJECT};${ARM_GIC_GERRIT_REFSPEC}"
+  ["arm-fvp-base-pac"]="${GERRIT_HOST};${ARM_FVP_BASE_PAC_GERRIT_PROJECT};${ARM_FVP_BASE_PAC_GERRIT_REFSPEC}"
+  ["arm-sp805"]="${GERRIT_HOST};${ARM_SP805_GERRIT_PROJECT};${ARM_SP805_GERRIT_REFSPEC}"
+  ["arm-xlat"]="${GERRIT_HOST};${ARM_XLAT_GERRIT_PROJECT};${ARM_XLAT_GERRIT_REFSPEC}"
+  ["firmware-development-guide"]="${GERRIT_HOST};${ARM_FW_DEV_GUIDE_GERRIT_PROJECT};${ARM_FW_DEV_GUIDE_REFSPEC}"
 )
 
 
@@ -121,8 +107,8 @@
     declare -A build_configs=(
         ["trusted-firmware-a"]="${config_fields[0]}"
         ["tf-a-tests"]="${config_fields[1]}"
-        ["spm"]="${config_fields[4]}"
-        ["tf-rmm"]="${config_fields[5]}"
+        ["spm"]="${config_fields[2]}"
+        ["tf-rmm"]="${config_fields[3]}"
     )
 fi
 
@@ -144,7 +130,7 @@
 if [ -f ${SHARE_FOLDER}/${JOBS_REPO_NAME}.tar.gz ]; then
     tar -xzf ${SHARE_FOLDER}/${JOBS_REPO_NAME}.tar.gz
 else
-    git clone ${GIT_CLONE_PARAMS} ${GIT_REPO}/${JOBS_PROJECT} ${JOBS_REPO_NAME} --branch ${JOBS_BRANCH}
+    git clone ${GIT_CLONE_PARAMS} ${GIT_REPO}/${JOBS_PROJECT} ${JOBS_REPO_NAME}
     git -C ${JOBS_REPO_NAME} fetch origin ${JOBS_REFSPEC}
     git -C ${JOBS_REPO_NAME} checkout FETCH_HEAD
 
@@ -163,11 +149,10 @@
     fi
 
     # parse the repo elements
-    IFS=';' read -r REPO_HOST REPO_PROJECT REPO_DEFAULT_BRANCH REPO_DEFAULT_REFSPEC <<< "${repos_map[${repo}]}"
+    IFS=';' read -r REPO_HOST REPO_PROJECT REPO_DEFAULT_REFSPEC <<< "${repos_map[${repo}]}"
 
     REPO_NAME="$repo"
     REPO_URL="${REPO_HOST}/${REPO_PROJECT}"
-    REPO_BRANCH="${REPO_DEFAULT_BRANCH}"
     REPO_REFSPEC="${REPO_DEFAULT_REFSPEC}"
     REPO_SSH_URL="ssh://${CI_BOT_USERNAME}@${REPO_HOST#https://}:29418/${REPO_PROJECT}"
 
@@ -184,10 +169,10 @@
     else
         if [[ ${FETCH_SSH} ]]; then
             GIT_SSH_COMMAND="ssh ${SSH_PARAMS}" git clone ${GIT_CLONE_PARAMS} ${REPO_SSH_URL} ${REPO_NAME} \
-                    --depth 1 --recurse-submodules --shallow-submodules --branch ${REPO_BRANCH}
+                    --depth 1 --recurse-submodules --shallow-submodules
         else
             git clone ${GIT_CLONE_PARAMS} ${REPO_URL} ${REPO_NAME} \
-                    --depth 1 --recurse-submodules --shallow-submodules --branch ${REPO_BRANCH}
+                    --depth 1 --recurse-submodules --shallow-submodules
         fi
 
         # If the Gerrit review that triggered the CI had a topic, it will be used to synchronize the other repositories
diff --git a/tf-a-arm-weekly.yaml b/tf-a-arm-weekly.yaml
index fe81658..f6906d5 100644
--- a/tf-a-arm-weekly.yaml
+++ b/tf-a-arm-weekly.yaml
@@ -19,7 +19,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
       - string:
           name: TF_GERRIT_REFSPEC
           default: +refs/heads/integration:refs/remotes/origin/integration
@@ -28,7 +28,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: TFTF_GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
diff --git a/tf-a-gerrit-tforg-l1.yaml b/tf-a-gerrit-tforg-l1.yaml
index bc9be97..fa47a8c 100644
--- a/tf-a-gerrit-tforg-l1.yaml
+++ b/tf-a-gerrit-tforg-l1.yaml
@@ -20,7 +20,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/integration:refs/remotes/origin/integration
@@ -39,7 +39,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: TFTF_GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
diff --git a/tf-a-gerrit-tforg-l2.yaml b/tf-a-gerrit-tforg-l2.yaml
index 7092c24..36953d1 100644
--- a/tf-a-gerrit-tforg-l2.yaml
+++ b/tf-a-gerrit-tforg-l2.yaml
@@ -20,7 +20,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/integration:refs/remotes/origin/integration
@@ -39,7 +39,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: TFTF_GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
diff --git a/tf-a-lts2.10-gerrit-tforg-l1.yaml b/tf-a-lts2.10-gerrit-tforg-l1.yaml
index 7294557..3e62c5e 100644
--- a/tf-a-lts2.10-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.10-gerrit-tforg-l1.yaml
@@ -20,7 +20,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.10
+          default: refs/heads/lts-v2.10
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
@@ -39,7 +39,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.10-gerrit-tforg-l2.yaml b/tf-a-lts2.10-gerrit-tforg-l2.yaml
index 83378a3..f35d63c 100644
--- a/tf-a-lts2.10-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.10-gerrit-tforg-l2.yaml
@@ -20,7 +20,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.10
+          default: refs/heads/lts-v2.10
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
@@ -39,7 +39,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.10-main.yaml b/tf-a-lts2.10-main.yaml
index 8bbe917..41b2c91 100644
--- a/tf-a-lts2.10-main.yaml
+++ b/tf-a-lts2.10-main.yaml
@@ -19,7 +19,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: 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
@@ -28,7 +28,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml b/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml
index df4eb4b..7ea42d6 100644
--- a/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.10-tftf-gerrit-tforg-l1.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.10
+          default: refs/heads/lts-v2.10
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: lts-v2.10
+          default: refs/heads/lts-v2.10
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml b/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml
index b7944a7..106ea4c 100644
--- a/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.10-tftf-gerrit-tforg-l2.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.10
+          default: refs/heads/lts-v2.10
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.10:refs/remotes/origin/lts-v2.10
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: lts-v2.10
+          default: refs/heads/lts-v2.10
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-lts2.12-gerrit-tforg-l1.yaml b/tf-a-lts2.12-gerrit-tforg-l1.yaml
index dd63116..70bfbf5 100644
--- a/tf-a-lts2.12-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.12-gerrit-tforg-l1.yaml
@@ -20,7 +20,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.12
+          default: refs/heads/lts-v2.12
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
@@ -39,7 +39,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.12-gerrit-tforg-l2.yaml b/tf-a-lts2.12-gerrit-tforg-l2.yaml
index 8334f2c..5db916d 100644
--- a/tf-a-lts2.12-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.12-gerrit-tforg-l2.yaml
@@ -20,7 +20,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.12
+          default: refs/heads/lts-v2.12
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
@@ -39,7 +39,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.12-main.yaml b/tf-a-lts2.12-main.yaml
index de60a78..c67e232 100644
--- a/tf-a-lts2.12-main.yaml
+++ b/tf-a-lts2.12-main.yaml
@@ -19,7 +19,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: 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
@@ -28,7 +28,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml b/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
index 1ed9bd6..9573aca 100644
--- a/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.12-tftf-gerrit-tforg-l1.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.12
+          default: refs/heads/lts-v2.12
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: lts-v2.12
+          default: refs/heads/lts-v2.12
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml b/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml
index 0fbbb0c..87894a9 100644
--- a/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.12-tftf-gerrit-tforg-l2.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.12
+          default: refs/heads/lts-v2.12
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.12:refs/remotes/origin/lts-v2.12
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: lts-v2.12
+          default: refs/heads/lts-v2.12
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-lts2.8-gerrit-tforg-l1.yaml b/tf-a-lts2.8-gerrit-tforg-l1.yaml
index c50cf0d..15ebc30 100644
--- a/tf-a-lts2.8-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.8-gerrit-tforg-l1.yaml
@@ -21,7 +21,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.8
+          default: refs/heads/lts-v2.8
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
@@ -40,7 +40,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.8-gerrit-tforg-l2.yaml b/tf-a-lts2.8-gerrit-tforg-l2.yaml
index 930e764..ee537ea 100644
--- a/tf-a-lts2.8-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.8-gerrit-tforg-l2.yaml
@@ -21,7 +21,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.8
+          default: refs/heads/lts-v2.8
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
@@ -40,7 +40,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.8-main.yaml b/tf-a-lts2.8-main.yaml
index b18c168..1230f0e 100644
--- a/tf-a-lts2.8-main.yaml
+++ b/tf-a-lts2.8-main.yaml
@@ -19,7 +19,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: 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
@@ -28,7 +28,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: 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
diff --git a/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml b/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml
index c8fc0a5..b589023 100644
--- a/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-lts2.8-tftf-gerrit-tforg-l1.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.8
+          default: refs/heads/lts-v2.8
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: lts-v2.8
+          default: refs/heads/lts-v2.8
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml b/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml
index 4b9199b..770c3aa 100644
--- a/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-lts2.8-tftf-gerrit-tforg-l2.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: lts-v2.8
+          default: refs/heads/lts-v2.8
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/lts-v2.8:refs/remotes/origin/lts-v2.8
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: lts-v2.8
+          default: refs/heads/lts-v2.8
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-main.yaml b/tf-a-main.yaml
index 100bd14..e49a128 100644
--- a/tf-a-main.yaml
+++ b/tf-a-main.yaml
@@ -19,7 +19,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
       - string:
           name: TF_GERRIT_REFSPEC
           default: +refs/heads/integration:refs/remotes/origin/integration
@@ -28,7 +28,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: TFTF_GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
diff --git a/tf-a-static-checks.yaml b/tf-a-static-checks.yaml
index 54669b7..8f305ac 100644
--- a/tf-a-static-checks.yaml
+++ b/tf-a-static-checks.yaml
@@ -15,7 +15,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
       - string:
           name: TF_GERRIT_REFSPEC
           default: +refs/heads/integration:refs/remotes/origin/integration
@@ -24,7 +24,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: TFTF_GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
diff --git a/tf-a-tftf-gerrit-tforg-l1.yaml b/tf-a-tftf-gerrit-tforg-l1.yaml
index a9bf5b8..8a5e694 100644
--- a/tf-a-tftf-gerrit-tforg-l1.yaml
+++ b/tf-a-tftf-gerrit-tforg-l1.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-tftf-gerrit-tforg-l2.yaml b/tf-a-tftf-gerrit-tforg-l2.yaml
index de9643d..6d9b947 100644
--- a/tf-a-tftf-gerrit-tforg-l2.yaml
+++ b/tf-a-tftf-gerrit-tforg-l2.yaml
@@ -20,7 +20,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master
@@ -32,7 +32,7 @@
           default: ""
       - string:
           name: TF_GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
diff --git a/tf-a-tftf-main.yaml b/tf-a-tftf-main.yaml
index 104eb91..3834ff2 100644
--- a/tf-a-tftf-main.yaml
+++ b/tf-a-tftf-main.yaml
@@ -20,7 +20,7 @@
           description: Gerrit project name for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
           description: Git project branch for Trusted Firmware-A.
       - string:
           name: TF_GERRIT_REFSPEC
@@ -32,7 +32,7 @@
           description: Gerrit project name for the Trusted Firmware-A Test Framework.
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
           description: Git branch for the Trusted Firmware-A Test Framework.
       - string:
           name: TFTF_GERRIT_REFSPEC
diff --git a/tf-a-weekly.yaml b/tf-a-weekly.yaml
index d277db4..e635415 100644
--- a/tf-a-weekly.yaml
+++ b/tf-a-weekly.yaml
@@ -19,7 +19,7 @@
           default: TF-A/trusted-firmware-a
       - string:
           name: TF_GERRIT_BRANCH
-          default: integration
+          default: refs/heads/integration
       - string:
           name: TF_GERRIT_REFSPEC
           default: +refs/heads/integration:refs/remotes/origin/integration
@@ -28,7 +28,7 @@
           default: TF-A/tf-a-tests
       - string:
           name: TFTF_GERRIT_BRANCH
-          default: master
+          default: refs/heads/master
       - string:
           name: TFTF_GERRIT_REFSPEC
           default: +refs/heads/master:refs/remotes/origin/master