diff --git a/run_config/fvp-fip.tc0 b/run_config/fvp-fip.tc0
index bf78d48..e885793 100644
--- a/run_config/fvp-fip.tc0
+++ b/run_config/fvp-fip.tc0
@@ -11,7 +11,7 @@
 
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_ramfw.bin" ]; then
-		url="$scp_prebuilts/scp_ramfw.bin" fetch_file
+		url="$scp_prebuilts/tc0/scp_ramfw.bin" fetch_file
 		archive_file "scp_ramfw.bin"
 	fi
 
diff --git a/run_config/fvp-fip.tc1 b/run_config/fvp-fip.tc1
index 439ec70..e5b630e 100644
--- a/run_config/fvp-fip.tc1
+++ b/run_config/fvp-fip.tc1
@@ -11,7 +11,7 @@
 
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_ramfw.bin" ]; then
-		url="$scp_prebuilts/scp_ramfw.bin" fetch_file
+		url="$scp_prebuilts/tc1/scp_ramfw.bin" fetch_file
 		archive_file "scp_ramfw.bin"
 	fi
 
diff --git a/run_config/fvp-tc0 b/run_config/fvp-tc0
index 4199743..d6c6b57 100644
--- a/run_config/fvp-tc0
+++ b/run_config/fvp-tc0
@@ -8,7 +8,7 @@
 fetch_tf_resource() {
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_romfw.bin" ]; then
-		url="$scp_prebuilts/scp_romfw.bin" fetch_file
+		url="$scp_prebuilts/tc0/scp_romfw.bin" fetch_file
 		archive_file "scp_romfw.bin"
 	fi
 
diff --git a/run_config/fvp-tc1 b/run_config/fvp-tc1
index c401de8..af37cde 100644
--- a/run_config/fvp-tc1
+++ b/run_config/fvp-tc1
@@ -8,7 +8,7 @@
 fetch_tf_resource() {
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_romfw.bin" ]; then
-		url="$scp_prebuilts/scp_romfw.bin" fetch_file
+		url="$scp_prebuilts/tc1/scp_romfw.bin" fetch_file
 		archive_file "scp_romfw.bin"
 	fi
 
diff --git a/tc1_utils.sh b/tc1_utils.sh
deleted file mode 100644
index 9893d11..0000000
--- a/tc1_utils.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-source "$ci_root/fvp_utils.sh"
-
-tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute/tc1}"
-
-# Pre-built SCP v2.8.0 release binaries
-scp_prebuilts="${scp_prebuilts:-$tfa_downloads/total_compute_scp_2.8.0/tc1}"
-
-fvp_kernels[fvp-tc-kernel]="$tc_prebuilts/Image"
-fvp_initrd_urls[fvp-tc-ramdisk]="$tc_prebuilts/uInitrd-busybox.0x88000000"
-
-initrd_addr=0x8000000
-kernel_addr=0x80000
-scp_ram_addr=0x0bd80000
diff --git a/tc0_utils.sh b/tc_utils.sh
similarity index 85%
rename from tc0_utils.sh
rename to tc_utils.sh
index 35bf61e..60c06f4 100644
--- a/tc0_utils.sh
+++ b/tc_utils.sh
@@ -7,10 +7,10 @@
 
 source "$ci_root/fvp_utils.sh"
 
-tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute/tc0}"
+tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute/}"
 
 # Pre-built SCP v2.8.0 release binaries
-scp_prebuilts="${scp_prebuilts:-$tfa_downloads/total_compute_scp_2.8.0/tc0}"
+scp_prebuilts="${scp_prebuilts:-$tfa_downloads/total_compute_scp_2.8.0/}"
 
 fvp_kernels[fvp-tc-kernel]="$tc_prebuilts/Image"
 fvp_initrd_urls[fvp-tc-ramdisk]="$tc_prebuilts/uInitrd-busybox.0x88000000"