diff --git a/arm-env.sh b/arm-env.sh
index ce40ae3..1152578 100644
--- a/arm-env.sh
+++ b/arm-env.sh
@@ -18,7 +18,7 @@
 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"
-scp_src_repo_url="${scp_src_repo_url:-http://$arm_gerrit_url/scp/firmware}"
+scp_src_repo_default="${scp_src_repo_default:-http://$arm_gerrit_url/scp/firmware}"
 cc_src_repo_url="${cc_src_repo_url:-https://$arm_gerrit_url/tests/lava/test-definitions.git}"
 cc_src_repo_tag="${cc_src_repo_tag:-kernel-team-workflow_2019-09-20}"
 scp_tools_src_repo_url="${scp_tools_src_repo_url:-http://$arm_gerrit_url/scp/tools-non-public}"
diff --git a/script/clone_repos.sh b/script/clone_repos.sh
index 38e2eab..304ce53 100755
--- a/script/clone_repos.sh
+++ b/script/clone_repos.sh
@@ -422,7 +422,6 @@
 	# NOTE: currently scp/firmware:master is not tracking the upstream.
 	# Therefore, if the url is gerrit.oss.arm.com/scp/firmware and there is
 	# no ref_spec, then set the ref_spec to master-upstream.
-	scp_src_repo_default="http://gerrit.oss.arm.com/scp/firmware"
 	if [ "$scp_src_repo_url" = "$scp_src_repo_default" ]; then
 		SCP_REFSPEC="${SCP_REFSPEC:-master-upstream}"
 	fi
diff --git a/utils.sh b/utils.sh
index d0ffd1b..2a92239 100644
--- a/utils.sh
+++ b/utils.sh
@@ -307,6 +307,7 @@
 tftf_src_repo_url="${tftf_src_repo_url:-$TFTF_SRC_REPO_URL}"
 tftf_src_repo_url="${tftf_src_repo_url:-https://$tforg_gerrit_url/TF-A/tf-a-tests}"
 scp_src_repo_url="${scp_src_repo_url:-$SCP_SRC_REPO_URL}"
+scp_src_repo_url="${scp_src_repo_url:-$scp_src_repo_default}"
 
 # FIXME set a sane default for tfa_downloads
 tfa_downloads="${tfa_downloads:-file:///downloads/tf-a}"