diff --git a/run_config/fvp-aem8a.singlecluster b/run_config/fvp-aem8a.singlecluster
index cadda8a..8fd95cc 100755
--- a/run_config/fvp-aem8a.singlecluster
+++ b/run_config/fvp-aem8a.singlecluster
@@ -12,4 +12,8 @@
 	cluster_2_num_cores="0" \
 	cluster_3_num_cores="0" \
 	gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a b/run_config/fvp-aemv8a
index 092e7f8..cdf2437 100644
--- a/run_config/fvp-aemv8a
+++ b/run_config/fvp-aemv8a
@@ -7,4 +7,8 @@
 
 post_fetch_tf_resource() {
 	model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.64only b/run_config/fvp-aemv8a.64only
index 3387cb2..799b3ee 100644
--- a/run_config/fvp-aemv8a.64only
+++ b/run_config/fvp-aemv8a.64only
@@ -7,4 +7,8 @@
 
 post_fetch_tf_resource() {
 	aarch64_only=1 model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.8_3 b/run_config/fvp-aemv8a.8_3
index 6ab0898..f57d574 100644
--- a/run_config/fvp-aemv8a.8_3
+++ b/run_config/fvp-aemv8a.8_3
@@ -9,4 +9,8 @@
 	model="base-aemv8a" \
 	arch_version="8.3" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.8_4 b/run_config/fvp-aemv8a.8_4
index edff386..4ed7337 100644
--- a/run_config/fvp-aemv8a.8_4
+++ b/run_config/fvp-aemv8a.8_4
@@ -9,4 +9,8 @@
 	model="base-aemv8a" \
 	arch_version="8.4" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.8_5 b/run_config/fvp-aemv8a.8_5
index 4c076f8..231516c 100644
--- a/run_config/fvp-aemv8a.8_5
+++ b/run_config/fvp-aemv8a.8_5
@@ -9,4 +9,8 @@
 	model="base-aemv8a" \
 	arch_version="8.5" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.8_5+mte b/run_config/fvp-aemv8a.8_5+mte
index 7cb1bad..4b1d8b5 100644
--- a/run_config/fvp-aemv8a.8_5+mte
+++ b/run_config/fvp-aemv8a.8_5+mte
@@ -13,4 +13,8 @@
 	cache_state_modelled="0" \
 	memory_tagging_support_level="2" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.8_5.bmcov b/run_config/fvp-aemv8a.8_5.bmcov
index ef09596..f658076 100644
--- a/run_config/fvp-aemv8a.8_5.bmcov
+++ b/run_config/fvp-aemv8a.8_5.bmcov
@@ -10,4 +10,8 @@
 	model="base-aemv8a" \
 	arch_version="8.5" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.NVM_reboot b/run_config/fvp-aemv8a.NVM_reboot
index 35cf49a..f881e8f 100644
--- a/run_config/fvp-aemv8a.NVM_reboot
+++ b/run_config/fvp-aemv8a.NVM_reboot
@@ -31,4 +31,8 @@
 	flashloader0_fwrite="flash0" \
 	flashloader1_fwrite="flash1" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32 b/run_config/fvp-aemv8a.aarch32
index eff781d..e92af55 100644
--- a/run_config/fvp-aemv8a.aarch32
+++ b/run_config/fvp-aemv8a.aarch32
@@ -7,4 +7,8 @@
 
 post_fetch_tf_resource() {
 	aarch32="1" model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32+8_4 b/run_config/fvp-aemv8a.aarch32+8_4
index 2e16d74..a156f0c 100644
--- a/run_config/fvp-aemv8a.aarch32+8_4
+++ b/run_config/fvp-aemv8a.aarch32+8_4
@@ -8,4 +8,8 @@
 post_fetch_tf_resource() {
 	aarch32="1" model="base-aemv8a" arch_version="8.4" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32+bl2_el3 b/run_config/fvp-aemv8a.aarch32+bl2_el3
index f082488..3343c59 100644
--- a/run_config/fvp-aemv8a.aarch32+bl2_el3
+++ b/run_config/fvp-aemv8a.aarch32+bl2_el3
@@ -12,4 +12,8 @@
 		model="base-aemv8a" gen_model_params
 
 	uart="0" set_expect_variable "skip_early_boot_msgs" "1"
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32+memprotect b/run_config/fvp-aemv8a.aarch32+memprotect
index 1779b3f..b956367 100644
--- a/run_config/fvp-aemv8a.aarch32+memprotect
+++ b/run_config/fvp-aemv8a.aarch32+memprotect
@@ -15,4 +15,8 @@
 	memprotect="$image" \
 	memprotect_addr="0xBFC0000" \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32+regreset b/run_config/fvp-aemv8a.aarch32+regreset
index e8501d1..d56763f 100644
--- a/run_config/fvp-aemv8a.aarch32+regreset
+++ b/run_config/fvp-aemv8a.aarch32+regreset
@@ -10,4 +10,8 @@
 		cluster_1_reg_reset="0xffffffff" \
 		aarch32=1 \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32.8_3 b/run_config/fvp-aemv8a.aarch32.8_3
index b4273ff..e6a811c 100644
--- a/run_config/fvp-aemv8a.aarch32.8_3
+++ b/run_config/fvp-aemv8a.aarch32.8_3
@@ -10,4 +10,8 @@
 	arch_version="8.3" \
 	aarch32="1" \
 	gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32.NVM_reboot b/run_config/fvp-aemv8a.aarch32.NVM_reboot
index 2cd6d9c..57bc41a 100644
--- a/run_config/fvp-aemv8a.aarch32.NVM_reboot
+++ b/run_config/fvp-aemv8a.aarch32.NVM_reboot
@@ -31,4 +31,8 @@
 	flashloader0_fwrite="flash0" \
 	flashloader1_fwrite="flash1" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32.nocache b/run_config/fvp-aemv8a.aarch32.nocache
index 07a05d1..08b60fe 100644
--- a/run_config/fvp-aemv8a.aarch32.nocache
+++ b/run_config/fvp-aemv8a.aarch32.nocache
@@ -7,4 +7,8 @@
 
 post_fetch_tf_resource() {
 	cache_state_modelled="0" aarch32="1" model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic b/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
index 9fbe1df..8afd6af 100644
--- a/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
+++ b/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
@@ -17,6 +17,10 @@
 
 post_tf_archive() {
 	aarch32="1" 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-aemv8a.amu b/run_config/fvp-aemv8a.amu
index 2b5e3c7..5820aaa 100644
--- a/run_config/fvp-aemv8a.amu
+++ b/run_config/fvp-aemv8a.amu
@@ -6,4 +6,8 @@
 	amu_present="1" \
 	cache_state_modelled="0" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.amu.aarch32 b/run_config/fvp-aemv8a.amu.aarch32
index 613acbd..f27725d 100644
--- a/run_config/fvp-aemv8a.amu.aarch32
+++ b/run_config/fvp-aemv8a.amu.aarch32
@@ -7,4 +7,8 @@
 	aarch32="1" \
 	cache_state_modelled="0" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.amu.bmcov b/run_config/fvp-aemv8a.amu.bmcov
index 9daabf9..b8261cf 100644
--- a/run_config/fvp-aemv8a.amu.bmcov
+++ b/run_config/fvp-aemv8a.amu.bmcov
@@ -7,4 +7,8 @@
 	amu_present="1" \
 	cache_state_modelled="0" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.assymetric b/run_config/fvp-aemv8a.assymetric
index a7b21b8..54d277e 100644
--- a/run_config/fvp-aemv8a.assymetric
+++ b/run_config/fvp-aemv8a.assymetric
@@ -15,4 +15,8 @@
 		cluster_1_num_cores="3" \
 		model="base-aemv8a" gen_model_params
 	uart="0" set_expect_variable "num_cpus" "5"
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.assymetric.bmcov b/run_config/fvp-aemv8a.assymetric.bmcov
index f905177..9f7751d 100644
--- a/run_config/fvp-aemv8a.assymetric.bmcov
+++ b/run_config/fvp-aemv8a.assymetric.bmcov
@@ -16,4 +16,8 @@
 		cluster_1_num_cores="3" \
 		model="base-aemv8a" gen_model_params
 	uart="0" set_expect_variable "num_cpus" "5"
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.bl2_el3 b/run_config/fvp-aemv8a.bl2_el3
index 66e1945..4ee5f97 100644
--- a/run_config/fvp-aemv8a.bl2_el3
+++ b/run_config/fvp-aemv8a.bl2_el3
@@ -11,4 +11,8 @@
 		model="base-aemv8a" gen_model_params
 
 	uart="0" set_expect_variable "skip_early_boot_msgs" "1"
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.bmcov b/run_config/fvp-aemv8a.bmcov
index d8e6bc7..3e4b476 100644
--- a/run_config/fvp-aemv8a.bmcov
+++ b/run_config/fvp-aemv8a.bmcov
@@ -8,4 +8,8 @@
 post_fetch_tf_resource() {
 	bmcov_plugin=1 bmcov_plugin_path="${coverage_trace_plugin}" \
         model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.crash b/run_config/fvp-aemv8a.crash
index dac87ed..8eb9c11 100644
--- a/run_config/fvp-aemv8a.crash
+++ b/run_config/fvp-aemv8a.crash
@@ -15,6 +15,10 @@
 post_tf_archive() {
 	model="base-aemv8a" fault_inject="1" 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-aemv8a.el3payload b/run_config/fvp-aemv8a.el3payload
index 7f0e656..9f2d68f 100644
--- a/run_config/fvp-aemv8a.el3payload
+++ b/run_config/fvp-aemv8a.el3payload
@@ -9,4 +9,8 @@
 	pctl_startup="0.0.*.0,0.1.*.0" \
 		secure_ram_fill="1" \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.fi b/run_config/fvp-aemv8a.fi
index f559760..2945882 100644
--- a/run_config/fvp-aemv8a.fi
+++ b/run_config/fvp-aemv8a.fi
@@ -15,4 +15,8 @@
 post_tf_archive() {
 	model="base-aemv8a" fault_inject="1" arch_version="8.4" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.gicv3_spi b/run_config/fvp-aemv8a.gicv3_spi
index 160dfdd..4b40c9c 100644
--- a/run_config/fvp-aemv8a.gicv3_spi
+++ b/run_config/fvp-aemv8a.gicv3_spi
@@ -9,4 +9,8 @@
 	model="base-aemv8a" \
 	gicv3_spi_count="988" \
 	gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.gicv4 b/run_config/fvp-aemv8a.gicv4
index 85c5325..e5332c1 100644
--- a/run_config/fvp-aemv8a.gicv4
+++ b/run_config/fvp-aemv8a.gicv4
@@ -16,4 +16,8 @@
 	gicv3_spi_count="988" \
 	has_gicv4_1="0" \
 	gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.invalid_nvcounter b/run_config/fvp-aemv8a.invalid_nvcounter
index d0cf71c..8b242aa 100644
--- a/run_config/fvp-aemv8a.invalid_nvcounter
+++ b/run_config/fvp-aemv8a.invalid_nvcounter
@@ -10,4 +10,8 @@
 	# image is expected to fail.
 	uart="0" file="trusted-firmware-load-error.exp" track_expect
 	model="base-aemv8a" nvcounter_diag="4" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.memprotect b/run_config/fvp-aemv8a.memprotect
index ac49bd6..4d83163 100644
--- a/run_config/fvp-aemv8a.memprotect
+++ b/run_config/fvp-aemv8a.memprotect
@@ -20,4 +20,8 @@
 	memprotect="$image" \
 	memprotect_addr="0xBFC0000" \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.nocm b/run_config/fvp-aemv8a.nocm
index ce7490f..6c74388 100644
--- a/run_config/fvp-aemv8a.nocm
+++ b/run_config/fvp-aemv8a.nocm
@@ -7,4 +7,8 @@
 
 post_fetch_tf_resource() {
 	cache_state_modelled="0" model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.nvcounter_v1 b/run_config/fvp-aemv8a.nvcounter_v1
index beb5990..d43be22 100644
--- a/run_config/fvp-aemv8a.nvcounter_v1
+++ b/run_config/fvp-aemv8a.nvcounter_v1
@@ -9,4 +9,8 @@
 	# Version 1 of the non-volatile counter may be incremented in a
 	# monotonic fashion (unlike version 0, which is fixed).
 	model="base-aemv8a" nvcounter_version="r1" nvcounter_diag="4" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.pl33 b/run_config/fvp-aemv8a.pl33
index 7f1d389..9c2c9a8 100644
--- a/run_config/fvp-aemv8a.pl33
+++ b/run_config/fvp-aemv8a.pl33
@@ -14,4 +14,8 @@
 	preload_bl33="1" \
 	preload_bl33_bin="tftf.bin" \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.pl33.bmcov b/run_config/fvp-aemv8a.pl33.bmcov
index 2f807af..80bd39a 100644
--- a/run_config/fvp-aemv8a.pl33.bmcov
+++ b/run_config/fvp-aemv8a.pl33.bmcov
@@ -15,4 +15,8 @@
 	preload_bl33="1" \
 	preload_bl33_bin="tftf.bin" \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.roxlattables.bl31_panic b/run_config/fvp-aemv8a.roxlattables.bl31_panic
index bf48dd9..9bb945d 100644
--- a/run_config/fvp-aemv8a.roxlattables.bl31_panic
+++ b/run_config/fvp-aemv8a.roxlattables.bl31_panic
@@ -15,6 +15,10 @@
 
 post_tf_archive() {
 	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-aemv8a.roxlattables.tspd_panic b/run_config/fvp-aemv8a.roxlattables.tspd_panic
index 29e3d3c..420b4bd 100644
--- a/run_config/fvp-aemv8a.roxlattables.tspd_panic
+++ b/run_config/fvp-aemv8a.roxlattables.tspd_panic
@@ -18,6 +18,10 @@
 
 post_tf_archive() {
 	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-aemv8a.rst31 b/run_config/fvp-aemv8a.rst31
index 293404d..1d674c2 100644
--- a/run_config/fvp-aemv8a.rst31
+++ b/run_config/fvp-aemv8a.rst31
@@ -14,4 +14,8 @@
 	preload_bl33_bin="uboot.bin" \
 	reset_to_bl31="1" \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.rstspmin b/run_config/fvp-aemv8a.rstspmin
index 4db3880..28011a3 100644
--- a/run_config/fvp-aemv8a.rstspmin
+++ b/run_config/fvp-aemv8a.rstspmin
@@ -9,4 +9,8 @@
 	reset_to_spmin="1" \
 		aarch32="1" \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.singlecore b/run_config/fvp-aemv8a.singlecore
index 73245a1..f65eb67 100644
--- a/run_config/fvp-aemv8a.singlecore
+++ b/run_config/fvp-aemv8a.singlecore
@@ -9,4 +9,8 @@
 	model="base-aemv8a" cluster_0_num_cores="1" cluster_1_num_cores="0" \
 		gen_model_params
 	uart="0" set_expect_variable "num_cpus" "1"
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.singlecore.bmcov b/run_config/fvp-aemv8a.singlecore.bmcov
index 8801a15..1d4bbfc 100644
--- a/run_config/fvp-aemv8a.singlecore.bmcov
+++ b/run_config/fvp-aemv8a.singlecore.bmcov
@@ -10,4 +10,8 @@
 	model="base-aemv8a" cluster_0_num_cores="1" cluster_1_num_cores="0" \
 		gen_model_params
 	uart="0" set_expect_variable "num_cpus" "1"
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.sve b/run_config/fvp-aemv8a.sve
index 168a423..fe9e9b7 100644
--- a/run_config/fvp-aemv8a.sve
+++ b/run_config/fvp-aemv8a.sve
@@ -8,4 +8,8 @@
 post_fetch_tf_resource() {
 	sve_plugin=1 \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.sve.bmcov b/run_config/fvp-aemv8a.sve.bmcov
index d9e31e8..e67009c 100644
--- a/run_config/fvp-aemv8a.sve.bmcov
+++ b/run_config/fvp-aemv8a.sve.bmcov
@@ -9,4 +9,8 @@
 	bmcov_plugin=1 bmcov_plugin_path="${coverage_trace_plugin}" \
 	sve_plugin=1 \
 		model="base-aemv8a" gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
diff --git a/run_config/fvp-aemv8a.tbb.disable_dyn_auth b/run_config/fvp-aemv8a.tbb.disable_dyn_auth
index c978292..5e02c91 100644
--- a/run_config/fvp-aemv8a.tbb.disable_dyn_auth
+++ b/run_config/fvp-aemv8a.tbb.disable_dyn_auth
@@ -13,6 +13,10 @@
 
 post_tf_archive() {
 	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-aemv8a.ubsan_test b/run_config/fvp-aemv8a.ubsan_test
index 51abf16..0c1b84b 100644
--- a/run_config/fvp-aemv8a.ubsan_test
+++ b/run_config/fvp-aemv8a.ubsan_test
@@ -13,6 +13,10 @@
 post_tf_archive() {
 	model="base-aemv8a" \
 		gen_model_params
+
+	model="base-aemv8a" \
+	model_bin="FVP_Base_AEMv8A-AEMv8A" \
+	       gen_fvp_yaml
 }
 
 fetch_tf_resource() {