diff --git a/run_config/fvp-fip.tc.tftf b/run_config/fvp-fip.tc.tftf
index 6bc2831..aecc23f 100644
--- a/run_config/fvp-fip.tc.tftf
+++ b/run_config/fvp-fip.tc.tftf
@@ -25,7 +25,7 @@
 	# sign AP bl1
 	sign_image bl1.bin $ap_bl1_flash_load_addr $ap_bl1_flash_size
 
-	# Update FIP with pre-built RSS binaries and signed AP BL1 to create host flash fip image
+	# Update FIP with pre-built RSE binaries and signed AP BL1 to create host flash fip image
 	update_fip
 
 	# Create GPT image
diff --git a/run_config/tc_rse_utils.sh b/run_config/tc_rse_utils.sh
index 4cf108c..f81eab0 100644
--- a/run_config/tc_rse_utils.sh
+++ b/run_config/tc_rse_utils.sh
@@ -16,12 +16,18 @@
 	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
-	url="$tc_prebuilts/tc$plat_variant/root-RSA-3072.pem" saveas="root-RSA-3072.pem" fetch_file
-	archive_file "root-RSA-3072.pem"
+	if [ $plat_variant -eq 2 ]; then
+		url="$tc_prebuilts/tc$plat_variant/root-RSA-3072.pem" saveas="root-RSA-3072.pem" fetch_file
+		archive_file "root-RSA-3072.pem"
+		RSE_SIGN_PRIVATE_KEY=$archive/root-RSA-3072.pem
+	elif [ $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
 
-	RSE_SIGN_PRIVATE_KEY=$archive/root-RSA-3072.pem
 	RSE_SEC_CNTR_INIT_VAL=1
-	RSE_LAYOUT_WRAPPER_VERSION="1.5.0"
+	RSE_LAYOUT_WRAPPER_VERSION="2.1.0"
 
 	cat << EOF > $tmpdir/$host_binary_layout
 enum image_attributes {
diff --git a/tc_utils.sh b/tc_utils.sh
index a310f80..b5441bc 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -28,7 +28,7 @@
 if [ $plat_variant -eq 2 ]; then
 	rse_revision="4ab7a20d"
 elif [ $plat_variant -eq 3 ]; then
-	rse_revision="cd8ece72a"
+	rse_revision="2fe1f7e"
 elif [ $plat_variant -eq 4 ]; then
 	rse_revision="213c553bf"
 fi