diff --git a/run_config/tc_rss_utils.sh b/run_config/tc_rss_utils.sh
index 8597029..1cafe08 100644
--- a/run_config/tc_rss_utils.sh
+++ b/run_config/tc_rss_utils.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2023, Arm Limited. All rights reserved.
+# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -21,7 +21,7 @@
 
 	RSS_SIGN_PRIVATE_KEY=$archive/root-RSA-3072.pem
 	RSS_SEC_CNTR_INIT_VAL=1
-	RSS_LAYOUT_WRAPPER_VERSION="1.7.0"
+	RSS_LAYOUT_WRAPPER_VERSION="1.5.0"
 
 	cat << EOF > $tmpdir/$host_binary_layout
 enum image_attributes {
@@ -72,29 +72,36 @@
 	archive_file "rss_rom.bin"
 
 	# Get pre-built rss bl2 signed bin
-	url="$prebuild_prefix/bl2_signed.bin" fetch_file
-	archive_file "bl2_signed.bin"
-
-	# Get pre-built rss TF-M NS signed bin
-	url="$prebuild_prefix/tfm_ns_signed.bin" fetch_file
-	archive_file "tfm_ns_signed.bin"
+	url="$prebuild_prefix/rss_bl2_signed.bin" fetch_file
+	archive_file "rss_bl2_signed.bin"
 
 	# Get pre-built rss TF-M S signed bin
-	url="$prebuild_prefix/tfm_s_signed.bin" fetch_file
-	archive_file "tfm_s_signed.bin"
+	url="$prebuild_prefix/rss_s_signed.bin" fetch_file
+	archive_file "rss_s_signed.bin"
 
 	# Get pre-built SCP signed bin
-	url="$prebuild_prefix/scp_signed.bin" fetch_file
-	archive_file "scp_signed.bin"
+	url="$prebuild_prefix/signed_scp_romfw.bin" fetch_file
+	archive_file "signed_scp_romfw.bin"
 
 	# Create FIP layout
 	"$fiptool" update \
-		--align 8192 --rss-bl2 "$archive/bl2_signed.bin" \
-		--align 8192 --rss-ns "$archive/tfm_ns_signed.bin" \
-		--align 8192 --rss-s "$archive/tfm_s_signed.bin" \
-		--align 8192 --rss-scp-bl1 "$archive/scp_signed.bin" \
+		--align 8192 --rss-bl2 "$archive/rss_bl2_signed.bin" \
+		--align 8192 --rss-s "$archive/rss_s_signed.bin" \
+		--align 8192 --rss-scp-bl1 "$archive/signed_scp_romfw.bin" \
 		--align 8192 --rss-ap-bl1 "$archive/$signed_bin" \
 		--out "host_flash_fip.bin" \
 		"$archive/fip.bin"
 	archive_file "host_flash_fip.bin"
 }
+
+get_rss_prov_bins() {
+	local prebuild_prefix=$tc_prebuilts/tc$plat_variant/$rss_revision
+
+	# Get pre-built rss rss_encrypted_cm_provisioning_bundle_0 bin
+	url="$prebuild_prefix/rss_encrypted_cm_provisioning_bundle_0.bin" fetch_file
+	archive_file "rss_encrypted_cm_provisioning_bundle_0.bin"
+
+	# Get pre-built rss rss_encrypted_dm_provisioning_bundle bin
+	url="$prebuild_prefix/rss_encrypted_dm_provisioning_bundle.bin" fetch_file
+	archive_file "rss_encrypted_dm_provisioning_bundle.bin"
+}
diff --git a/tc_utils.sh b/tc_utils.sh
index a77ca88..809c79e 100644
--- a/tc_utils.sh
+++ b/tc_utils.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -17,14 +17,14 @@
 scp_ram_addr=0x0bd80000
 
 rss_rom_addr=0x11000000
-vmmaddrwidth=23
+vmmaddrwidth=19
 rvbaddr_lw=0x0000
 rvbaddr_up=0x0000
 
 # AP bl1 0x00 is mapped to 0x70000000 in RSS memory map
 ap_bl1_flash_load_addr=0x70000000
-ap_bl1_flash_size=0x80000
-rss_revision="199e090f8"
+ap_bl1_flash_size=0x20000
+rss_revision="4ab7a20"
 
 # Hafnium build repo containing Secure hafnium binaries
 spm_secure_out_dir=secure_tc_clang