diff --git a/clone.sh b/clone.sh
index 333a4db..407883d 100755
--- a/clone.sh
+++ b/clone.sh
@@ -46,14 +46,6 @@
 TFM_TESTS_REFSPEC="${TFM_TESTS_REFSPEC:-}"
 TFM_TESTS_NAME="tf-m-tests"
 
-TFM_EXTRAS_PROJECT="${TFM_EXTRAS_URL:-}"
-TFM_EXTRAS_REFSPEC="${TFM_EXTRAS_REFSPEC:-}"
-TFM_EXTRAS_NAME="tf-m-extras"
-
-FREERTOS_KERNEL_PROJECT="${FREERTOS_KERNEL_URL:-}"
-FREERTOS_KERNEL_REFSPEC="${FREERTOS_KERNEL_REFSPEC:-}"
-FREERTOS_KERNEL_NAME="freertos-kernel"
-
 MBEDTLS_PROJECT="${MBEDTLS_URL:-}"
 MBEDTLS_REFSPEC="${MBEDTLS_VERSION:-}"
 MBEDTLS_NAME="mbedtls"
@@ -68,7 +60,15 @@
 
 QCBOR_PROJECT="${QCBOR_URL:-}"
 QCBOR_REFSPEC="${QCBOR_VERSION:-}"
-QCBOR_NAME="QCBOR"
+QCBOR_NAME="qcbor"
+
+TFM_EXTRAS_PROJECT="${TFM_EXTRAS_URL:-}"
+TFM_EXTRAS_REFSPEC="${TFM_EXTRAS_REFSPEC:-}"
+TFM_EXTRAS_NAME="tf-m-extras"
+
+QA_TOOLS_PROJECT="https://review.trustedfirmware.org/ci/qa-tools"
+QA_TOOLS_REFSPEC="openci"
+QA_TOOLS_NAME="qa-tools"
 
 # Array containing "<repo url>;"<repo name>;<refspec>" elements
 repos=(
@@ -80,8 +80,7 @@
     "${PSA_ARCH_TESTS_PROJECT};${PSA_ARCH_TESTS_NAME};${PSA_ARCH_TESTS_REFSPEC}"
     "${QCBOR_PROJECT};${QCBOR_NAME};${QCBOR_REFSPEC}"
     "${TFM_EXTRAS_PROJECT};${TFM_EXTRAS_NAME};${TFM_EXTRAS_REFSPEC}"
-    "${FREERTOS_KERNEL_PROJECT};${FREERTOS_KERNEL_NAME};${FREERTOS_KERNEL_REFSPEC}"
-    "https://review.trustedfirmware.org/ci/qa-tools;qa-tools;openci"
+    "${QA_TOOLS_PROJECT};${QA_TOOLS_NAME};${QA_TOOLS_REFSPEC}"
 )
 
 # Take into consideration non-CI runs where SHARE_FOLDER variable