diff --git a/scripts/clone.sh b/scripts/clone.sh
index 5157541..c839e3d 100755
--- a/scripts/clone.sh
+++ b/scripts/clone.sh
@@ -64,14 +64,14 @@
 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}}"
-ARM_FFA_REFSPEC="${ARM_FFA_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_PL011_UART_REFSPEC="${ARM_PL011_UART_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_PSCI_REFSPEC="${ARM_PSCI_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_GIC_REFSPEC="${ARM_GIC_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_FVP_BASE_PAC_REFSPEC="${ARM_FVP_BASE_PAC_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_SP805_REFSPEC="${ARM_SP805_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_XLAT_REFSPEC="${ARM_XLAT_REFSPEC:-${REFSPEC_MAIN}}"
-ARM_FW_DEV_GUIDE_REFSPEC="${ARM_FW_DEV_GUIDE_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_GIC_GERRIT_REFSPEC="${ARM_GIC_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"
@@ -85,13 +85,13 @@
     "${GERRIT_HOST};${RMM_GERRIT_PROJECT};tf-rmm;${RMM_REFSPEC}"
     "${GERRIT_HOST};${TF_M_TESTS_GERRIT_PROJECT};tf-m-tests;${TF_M_TESTS_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${TF_M_EXTRAS_GERRIT_PROJECT};tf-m-extras;${TF_M_EXTRAS_GERRIT_REFSPEC}"
-    "${GERRIT_HOST};${ARM_FFA_GERRIT_PROJECT};arm-ffa;${ARM_FFA_REFSPEC}"
-    "${GERRIT_HOST};${ARM_PL011_UART_GERRIT_PROJECT};arm-pl011-uart;${ARM_PL011_UART_REFSPEC}"
-    "${GERRIT_HOST};${ARM_PSCI_GERRIT_PROJECT};arm-psci;${ARM_PSCI_REFSPEC}"
-    "${GERRIT_HOST};${ARM_GIC_GERRIT_PROJECT};arm-gic;${ARM_GIC_REFSPEC}"
-    "${GERRIT_HOST};${ARM_FVP_BASE_PAC_GERRIT_PROJECT};arm-fvp-base-pac;${ARM_FVP_BASE_PAC_REFSPEC}"
-    "${GERRIT_HOST};${ARM_SP805_GERRIT_PROJECT};arm-sp805;${ARM_SP805_REFSPEC}"
-    "${GERRIT_HOST};${ARM_XLAT_GERRIT_PROJECT};arm-xlat;${ARM_XLAT_REFSPEC}"
+    "${GERRIT_HOST};${ARM_FFA_GERRIT_PROJECT};arm-ffa;${ARM_FFA_GERRIT_REFSPEC}"
+    "${GERRIT_HOST};${ARM_PL011_UART_GERRIT_PROJECT};arm-pl011-uart;${ARM_PL011_UART_GERRIT_REFSPEC}"
+    "${GERRIT_HOST};${ARM_PSCI_GERRIT_PROJECT};arm-psci;${ARM_PSCI_GERRIT_REFSPEC}"
+    "${GERRIT_HOST};${ARM_GIC_GERRIT_PROJECT};arm-gic;${ARM_GIC_GERRIT_REFSPEC}"
+    "${GERRIT_HOST};${ARM_FVP_BASE_PAC_GERRIT_PROJECT};arm-fvp-base-pac;${ARM_FVP_BASE_PAC_GERRIT_REFSPEC}"
+    "${GERRIT_HOST};${ARM_SP805_GERRIT_PROJECT};arm-sp805;${ARM_SP805_GERRIT_REFSPEC}"
+    "${GERRIT_HOST};${ARM_XLAT_GERRIT_PROJECT};arm-xlat;${ARM_XLAT_GERRIT_REFSPEC}"
     "${GERRIT_HOST};${ARM_FW_DEV_GUIDE_GERRIT_PROJECT};firmware-development-guide;${ARM_FW_DEV_GUIDE_REFSPEC}"
 )