diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index d22b010..e6c3f2f 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -9,20 +9,13 @@
 	url="$tc_prebuilts/u-boot.bin" fetch_file
 	archive_file "u-boot.bin"
 
-	if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
-		if [ $plat_variant -eq 2 ]; then
-			# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
-			if [ ! -f "$archive/scp_ram.bin" ]; then
-				url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-			fi
-		elif [ $plat_variant -eq 3 ]; then
-			# Use pre-built SCP BL2 binary
-			url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-		fi
+	if [ $plat_variant -eq 3 ]; then
+		# Use pre-built SCP BL2 binary
+		url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
 		archive_file "scp_ram.bin"
 	fi
 
-	if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
+	if [ $plat_variant -eq 3 ]; then
 		build_fip BL33="$archive/u-boot.bin" SCP_BL2="$archive/scp_ram.bin"
 	elif [ $plat_variant -eq 4 ]; then
 		build_fip BL33="$archive/u-boot.bin"
diff --git a/run_config/fvp-fip.tc.tftf b/run_config/fvp-fip.tc.tftf
index 4a90f60..9c0b5f3 100644
--- a/run_config/fvp-fip.tc.tftf
+++ b/run_config/fvp-fip.tc.tftf
@@ -10,15 +10,7 @@
 	if [ $plat_variant -eq 3 ]; then
 		# Use pre-built SCP BL2 binary
 		url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-	else
-		# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
-		if [ ! -f "$archive/scp_ram.bin" ]; then
-			url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-		fi
-	fi
-	archive_file "scp_ram.bin"
-
-	if [ $plat_variant -eq 3 ]; then
+		archive_file "scp_ram.bin"
 		build_fip BL33="$archive/tftf.bin" SCP_BL2="$archive/scp_ram.bin"
 	else
 		build_fip BL33="$archive/tftf.bin"
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index f703379..05333be 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -16,24 +16,22 @@
 	# 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
-		if [ $plat_variant -eq 2 ]; then
-			url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
-		elif [ $plat_variant -eq 3 ] || [ $plat_variant -eq 4 ]; then
+		if [ $plat_variant -eq 3 ] || [ $plat_variant -eq 4 ]; then
 			url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
 		fi
 
 		archive_file "scp_rom.bin"
 	fi
 
-	# RSE is applicable to TC2, TC3 and TC4
-	if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ] || [ $plat_variant -eq 4 ]; then
+	# RSE is applicable to TC3 and TC4
+	if [ $plat_variant -eq 3 ] || [ $plat_variant -eq 4 ]; then
 
 	    # Hold RSE terminal_uart_ap
 	    uart="1" port="5003" file="hold_uart.exp" track_expect
 
 	    get_rse_prov_bins
 
-            # sign AP bl1
+		# sign AP bl1
 	    sign_image bl1.bin $ap_bl1_flash_load_addr $ap_bl1_flash_size
 
 	    # Update FIP with pre-built RSE binaries and signed AP BL1 to create host flash fip image
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 803bbdb..92891d0 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -8,20 +8,10 @@
 source "$ci_root/run_config/tc_rse_utils.sh"
 
 post_tf_build() {
-    if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
-        if [ $plat_variant -eq 2 ]; then
-            # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
-            if [ ! -f "$archive/scp_ram.bin" ]; then
-                url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-            fi
-        elif [ $plat_variant -eq 3 ]; then
-            # Use pre-built SCP BL2 binary
-            url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-        fi
+    if [ $plat_variant -eq 3 ]; then
+        # Use pre-built SCP BL2 binary
+        url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
         archive_file "scp_ram.bin"
-    fi
-
-    if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
         build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin" SCP_BL2="$archive/scp_ram.bin"
     elif [ $plat_variant -eq 4 ]; then
         build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"