diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index 23f0c76..8cd3dd9 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -10,15 +10,17 @@
 }
 
 fetch_tf_resource() {
-	url="$tfa_downloads/spm/02-05-2021/initrd.img" fetch_file
+	url="$tfa_downloads/spm/02-05-2021/initrd.img" saveas="initrd.bin" fetch_file
 	url="$tfa_downloads/spm/02-05-2021/manifest.dtb" fetch_file
 
-	archive_file "initrd.img"
+	archive_file "initrd.bin"
 	archive_file "manifest.dtb"
 
 	# Expect scripts
 	uart="0" file="spm-linux-uart0.exp" track_expect
 	uart="2" file="spm-uart2.exp" track_expect
+
+	payload_type="linux" gen_fvp_yaml_template
 }
 
 post_fetch_tf_resource() {
@@ -26,9 +28,9 @@
 
 	model="$model" \
 	arch_version="8.4" \
-	initrd_bin="initrd.img" \
+	initrd_bin="initrd.bin" \
 	el3_payload_bin="manifest.dtb" \
 		gen_model_params
 
-	model="$model" gen_fvp_yaml
+	model="$model" model_dtb="manifest.dtb" gen_fvp_yaml
 }