diff --git a/fvp_utils.sh b/fvp_utils.sh
index a3d398b..75f0a91 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -59,6 +59,7 @@
 fvp_morello="fvp:fvp_morello_0.11_33;/opt/model/FVP_Morello/models/Linux64_GCC-6.4"
 fvp_rd_v1="fvp:fvp_rd_v1_${model_version}_${model_build};/opt/model/FVP_RD_V1/models/${model_flavour}"
 fvp_tc3="fvp:fvp_tc3_11.26_16_linux64;/opt/model/FVP_TC3/models/${model_flavour}"
+fvp_tc4="fvp:fvp_tc4_0.0_8404;/opt/model/FVP_TC4/models/${model_flavour}"
 
 # FVP associate array, run_config are keys and fvp container parameters are the values
 #   Container parameters syntax: <model name>;<model dir>;<model bin>
@@ -101,6 +102,7 @@
 [morello]="${fvp_morello};FVP_Morello"
 [css-rdv1]="${fvp_rd_v1};FVP_RD_V1"
 [tc3]="${fvp_tc3};FVP_TC3"
+[tc4]="${fvp_tc4};FVP_TC4"
 [baser-aemv8r]="${fvp_base_aemv8r};FVP_BaseR_AEMv8R"
 [rd1ae]="${fvp_rd_1_ae};FVP_RD_1_AE"
 )
diff --git a/run_config/tc_rse_utils.sh b/run_config/tc_rse_utils.sh
index d15fc1f..f464725 100644
--- a/run_config/tc_rse_utils.sh
+++ b/run_config/tc_rse_utils.sh
@@ -16,11 +16,9 @@
 	host_binary_layout="`basename -s .bin ${1}`_ns"
 
 	# development PEM containing a key - use same key which is used for SCP BL1 in pre-built image
-	if [ $plat_variant -eq 3 ]; then
-		url="$tc_prebuilts/tc$plat_variant/root-EC-P256.pem" saveas="root-EC-P256.pem" fetch_file
-		archive_file "root-EC-P256.pem"
-		RSE_SIGN_PRIVATE_KEY=$archive/root-EC-P256.pem
-	fi
+	url="$tc_prebuilts/tc$plat_variant/root-EC-P256.pem" saveas="root-EC-P256.pem" fetch_file
+	archive_file "root-EC-P256.pem"
+	RSE_SIGN_PRIVATE_KEY=$archive/root-EC-P256.pem
 
 	RSE_SEC_CNTR_INIT_VAL=1
 	RSE_LAYOUT_WRAPPER_VERSION="2.1.0"
@@ -78,28 +76,25 @@
 	archive_file "rse_bl2_signed.bin"
 
 	# Get pre-built rse TF-M S signed bin
-	if [ $plat_variant -eq 3 ]; then
-		url="$prebuild_prefix/rse_s_encrypted.bin" fetch_file
-		archive_file "rse_s_encrypted.bin"
-		url="$prebuild_prefix/rse_s_sic_tables_signed.bin" fetch_file
-		archive_file "rse_s_sic_tables_signed.bin"
-	fi
+	url="$prebuild_prefix/rse_s_encrypted.bin" fetch_file
+	archive_file "rse_s_encrypted.bin"
+	url="$prebuild_prefix/rse_s_sic_tables_signed.bin" fetch_file
+	archive_file "rse_s_sic_tables_signed.bin"
 
 	# Get pre-built SCP signed bin
 	url="$prebuild_prefix/signed_scp_romfw.bin" fetch_file
 	archive_file "signed_scp_romfw.bin"
 
 	# Create FIP layout
-	if [ $plat_variant -eq 3 ]; then
-		"$fiptool" update \
-			--align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
-			--align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
-			--align 8192 --rse-ap-bl1 "$archive/$signed_bin" \
-			--align 8192 --rse-s "$archive/rse_s_encrypted.bin" \
-			--align 8192 --rse-sic-tables-s "$archive/rse_s_sic_tables_signed.bin" \
-			--out "host_flash_fip.bin" \
-			"$archive/fip.bin"
-	fi
+	"$fiptool" update \
+		--align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
+		--align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
+		--align 8192 --rse-ap-bl1 "$archive/$signed_bin" \
+		--align 8192 --rse-s "$archive/rse_s_encrypted.bin" \
+		--align 8192 --rse-sic-tables-s "$archive/rse_s_sic_tables_signed.bin" \
+		--out "host_flash_fip.bin" \
+		"$archive/fip.bin"
+
 	archive_file "host_flash_fip.bin"
 }