diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index c65fb72..749f721 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -17,6 +17,10 @@
 	model="base-aemv8a" \
 	arch_version="8.4" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
 
 fetch_tf_resource() {
diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index 2377a99..d8c9a47 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -25,6 +25,10 @@
 	initrd_bin="initrd.img" \
 	el3_payload_bin="manifest.dtb" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
 
 fetch_tf_resource() {
diff --git a/run_config/fvp-spm.optee b/run_config/fvp-spm.optee
index f5933e3..92034ff 100644
--- a/run_config/fvp-spm.optee
+++ b/run_config/fvp-spm.optee
@@ -16,6 +16,10 @@
 post_fetch_tf_resource() {
 	model="base-aemv8a" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
 
 fetch_tf_resource() {
diff --git a/run_config/fvp-spm.optee.sp b/run_config/fvp-spm.optee.sp
index 6cc8ac2..a5ab81a 100644
--- a/run_config/fvp-spm.optee.sp
+++ b/run_config/fvp-spm.optee.sp
@@ -30,6 +30,10 @@
 	model="base-aemv8a" \
 	arch_version="8.4" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
 
 fetch_tf_resource() {
diff --git a/run_config/fvp-spm.rstbl31 b/run_config/fvp-spm.rstbl31
index 1f3dcaa..8a19901 100644
--- a/run_config/fvp-spm.rstbl31
+++ b/run_config/fvp-spm.rstbl31
@@ -49,6 +49,10 @@
 	initrd_bin="initrd.img" \
 	el3_payload_bin="manifest.dtb" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
 
 fetch_tf_resource() {