diff --git a/arm-env.sh b/arm-env.sh
index d3d67d2..ef67a76 100644
--- a/arm-env.sh
+++ b/arm-env.sh
@@ -15,7 +15,6 @@
 
 # Source repositories.
 arm_gerrit_url="gerrit.oss.arm.com"
-tf_ci_repo_url="${CI_SRC_REPO_URL:-http://$arm_gerrit_url/pdswinf/ci/pdcs-platforms/platform-ci}"
 tf_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/pdcs-platforms/ap/tf-topics.git"
 tftf_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/trusted-firmware/tf-a-tests.git"
 ci_arm_gerrit_repo="ssh://$arm_gerrit_url:29418/pdswinf/ci/pdcs-platforms/platform-ci.git"
diff --git a/script/scratch_scripts/initial_clone_v2.6.sh b/script/scratch_scripts/initial_clone_v2.6.sh
index 8c6aace..d406131 100755
--- a/script/scratch_scripts/initial_clone_v2.6.sh
+++ b/script/scratch_scripts/initial_clone_v2.6.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -22,11 +22,11 @@
 
 arm_gerrit_url="gerrit.oss.arm.com"
 tforg_gerrit_url="review.trustedfirmware.org"
-ci_url="${CI_SRC_REPO_URL:-https://$arm_gerrit_url/pdswinf/ci/pdcs-platforms/platform-ci}"
-gerrit_server="arm"
+ci_url="${CI_SRC_REPO_URL:-https://$tforg_gerrit_url/ci/tf-a-ci-scripts}"
+gerrit_server="tforg"
 
-if [ "$ci_url" == *${tforg_gerrit_url}* ];then
-        gerrit_server="tforg"
+if [ "$ci_url" == *${arm_gerrit_url}* ];then
+        gerrit_server="arm"
 fi
 
 strip_var() {
@@ -36,7 +36,7 @@
 }
 
 set_ci_root() {
-	ci_root=`pwd`/"platform-ci"
+	ci_root=`pwd`/"trusted-firmware-ci"
 	CI_ROOT=$ci_root
 }
 
@@ -64,7 +64,7 @@
 			export REPO_UNDER_TEST="trusted-firmware-tf"
 			echo "REPO_UNDER_TEST is blank, setting REPO_UNDER_TEST based on GERRIT_PROJECT"
 
-		elif [ $GERRIT_PROJECT == "pdswinf/ci/pdcs-platforms/platform-ci" ]; then
+		elif [ $GERRIT_PROJECT == "pdswinf/ci/pdcs-platforms/platform-ci" ] || [ $GERRIT_PROJECT == "ci/tf-a-ci-scripts" ]; then
 			export REPO_UNDER_TEST="trusted-firmware-ci"
 			echo "REPO_UNDER_TEST is blank, setting REPO_UNDER_TEST based on GERRIT_PROJECT"
 		fi
@@ -110,13 +110,13 @@
 fi
 
 # Clone CI repository and move to the refspec
-if [ ! -d "platform-ci" ]
+if [ ! -d "trusted-firmware-ci" ]
 then
 git clone -q --depth 1 \
 	--reference /arm/projectscratch/ssg/trusted-fw/ref-repos/trusted-firmware-ci \
-	$ci_url platform-ci
+	$ci_url trusted-firmware-ci
 else
-	pushd platform-ci
+	pushd trusted-firmware-ci
 	git fetch
 	git checkout origin/master
 	popd
@@ -142,7 +142,7 @@
 				-p trusted-firmware-ci -s $gerrit_server "$CI_REFSPEC")"
 	fi
 
-	pushd platform-ci &>/dev/null
+	pushd trusted-firmware-ci &>/dev/null
 	git fetch -q --depth 1 origin "$CI_REFSPEC"
 	git checkout -q FETCH_HEAD
 	echo
diff --git a/utils.sh b/utils.sh
index 8c6b3f3..16b69f4 100644
--- a/utils.sh
+++ b/utils.sh
@@ -309,6 +309,7 @@
 tftf_src_repo_url="${tftf_src_repo_url:-https://$tforg_gerrit_url/TF-A/tf-a-tests}"
 ci_src_repo_url="${ci_src_repo_url:-$CI_SRC_REPO_URL}"
 ci_src_repo_url="${ci_src_repo_url:-https://$tforg_gerrit_url/ci/tf-a-ci-scripts}"
+tf_ci_repo_url="$ci_src_repo_url"
 scp_src_repo_url="${scp_src_repo_url:-$SCP_SRC_REPO_URL}"
 scp_src_repo_url="${scp_src_repo_url:-$scp_src_repo_default}"