diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index e32b552..6e5e740 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -5,16 +5,21 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+pre_tftf_build() {
+	# Build Cactus and Ivy images only
+	targets="cactus ivy" set_tftf_build_targets
+}
+
 post_tf_build() {
 	build_fip BL33="$archive/hafnium.bin" BL32="$archive/secure_hafnium.bin"
 }
 
 fetch_tf_resource() {
 	url="$tfa_downloads/spm/07-29-2021/initrd.img" saveas="initrd.bin" fetch_file
-	url="$tfa_downloads/spm/07-29-2021/manifest.dtb" fetch_file
+	url="$tfa_downloads/spm/07-29-2021/manifest.dtb" saveas="dtb.bin" fetch_file
 
 	archive_file "initrd.bin"
-	archive_file "manifest.dtb"
+	archive_file "dtb.bin"
 
 	# Expect scripts
 	uart="0" file="spm-linux-uart0.exp" track_expect
@@ -30,10 +35,9 @@
 	arch_version="8.5" \
 	has_branch_target_exception="1" \
 	restriction_on_speculative_execution="2" \
-	initrd_bin="initrd.bin" \
-	el3_payload_bin="manifest.dtb" \
+	dtb_addr=0x80000000 \
 	has_smmuv3_params="1" \
 		gen_model_params
 
-	model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
+	model="$model" model_dtb="dtb.bin" gen_fvp_yaml
 }
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 78a0399..0881e54 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -5,6 +5,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+pre_tftf_build() {
+	# Build Cactus and Ivy images only
+	targets="cactus ivy" set_tftf_build_targets
+}
+
 post_tf_build() {
 	#
 	# To build SP packages in TF-A we need to build FIP.
@@ -31,10 +36,10 @@
 
 fetch_tf_resource() {
 	url="$tfa_downloads/spm/07-29-2021/initrd.img" saveas="initrd.bin" fetch_file
-	url="$tfa_downloads/spm/07-29-2021/manifest.dtb" fetch_file
+	url="$tfa_downloads/spm/07-29-2021/manifest.dtb" saveas="dtb.bin" fetch_file
 
 	archive_file "initrd.bin"
-	archive_file "manifest.dtb"
+	archive_file "dtb.bin"
 
 	# Expect scripts
 	uart="0" file="spm-linux-uart0.exp" track_expect
@@ -59,10 +64,9 @@
 	sp2_pkg="cactus-secondary.pkg" \
 	sp3_pkg="cactus-tertiary.pkg" \
 	sp4_pkg="ivy.pkg" \
-	initrd_bin="initrd.bin" \
-	el3_payload_bin="manifest.dtb" \
+	dtb_addr=0x80000000 \
 	has_smmuv3_params="1" \
 		gen_model_params
 
-	model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
+	model="$model" model_dtb="dtb.bin" gen_fvp_yaml
 }