diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index 95707f4..9c22ee9 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -11,7 +11,7 @@
 
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_ram.bin" ]; then
-		url="$scp_prebuilts/tc$plat_variant/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+		url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
 		archive_file "scp_ram.bin"
 	fi
 
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 409aae6..12bcc39 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -13,7 +13,7 @@
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_rom.bin" ]; then
 		# Pick the appropriate binary based on target platform variant
-		url="$scp_prebuilts/tc$plat_variant/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
+		url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
 		archive_file "scp_rom.bin"
 	fi
 
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index a30e0af..1ce639a 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -9,7 +9,7 @@
 
 post_tf_build() {
     if [ ! -f "$archive/scp_ram.bin" ]; then
-        url="$scp_prebuilts/tc$plat_variant/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+        url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
         archive_file "scp_ram.bin"
     fi
 
@@ -20,7 +20,7 @@
     # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
     if [ ! -f "$archive/scp_rom.bin" ]; then
         # Pick the appropriate binary based on target platform variant
-        url="$scp_prebuilts/tc$plat_variant/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
+        url="$scp_mcp_downloads/tc$plat_variant/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
         archive_file "scp_rom.bin"
     fi
 
diff --git a/tc_utils.sh b/tc_utils.sh
index ea3989e..a77ca88 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -9,16 +9,6 @@
 
 tc_prebuilts="${tc_prebuilts:-$tfa_downloads/total_compute}"
 
-case "${plat_variant}" in
-    0)
-        scp_prebuilts="${scp_prebuilts:-$scp_mcp_2_11_0_downloads}"
-        ;;
-
-    *)
-        scp_prebuilts="${scp_prebuilts:-$scp_mcp_downloads}"
-        ;;
-esac
-
 kernel_list[tc-kernel]="$tc_prebuilts/Image"
 initrd_list[tc-ramdisk]="$tc_prebuilts/uInitrd-busybox.0x88000000"
 
diff --git a/utils.sh b/utils.sh
index d416441..d98b12e 100644
--- a/utils.sh
+++ b/utils.sh
@@ -590,7 +590,6 @@
 css_downloads="${css_downloads:-$tfa_downloads/css}"
 
 # SCP/MCP release binaries.
-scp_mcp_2_11_0_downloads="${scp_mcp_downloads:-$tfa_downloads/css_scp_2.11.0}"
 scp_mcp_downloads="${scp_mcp_downloads:-$tfa_downloads/css_scp_2.12.0}"
 
 linaro_2001_release="${linaro_2001_release:-$tfa_downloads/linaro/20.01}"