diff --git a/run_config/fvp-linux.quad b/run_config/fvp-linux.quad
index c9df29f..f4aef95 100644
--- a/run_config/fvp-linux.quad
+++ b/run_config/fvp-linux.quad
@@ -9,4 +9,6 @@
 	kernel_type="fvp-quad-busybox-uboot" get_kernel
 	initrd_type="default" get_initrd
 	uart="0" file="linux-rd-busybox.exp" track_expect
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.rootfs b/run_config/fvp-linux.rootfs
index b720ae1..b1bc531 100644
--- a/run_config/fvp-linux.rootfs
+++ b/run_config/fvp-linux.rootfs
@@ -10,4 +10,6 @@
 	initrd_type="dummy-ramdisk" get_initrd
 	get_rootfs
 	uart="0" timeout="1800" file="linux-oe.exp" track_expect
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.rootfs+ftpm b/run_config/fvp-linux.rootfs+ftpm
index ce346ca..530079b 100644
--- a/run_config/fvp-linux.rootfs+ftpm
+++ b/run_config/fvp-linux.rootfs+ftpm
@@ -17,4 +17,6 @@
         uart="1" timeout="600" file="tpm-logs.exp" track_expect
         set_run_env "ports_script" "$ci_root/model/ftpm-ports.awk"
         set_run_env "num_uarts" "2"
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.rootfs+rst31 b/run_config/fvp-linux.rootfs+rst31
index d7df0b9..731a21e 100644
--- a/run_config/fvp-linux.rootfs+rst31
+++ b/run_config/fvp-linux.rootfs+rst31
@@ -10,4 +10,6 @@
 	initrd_type="dummy-ramdisk" get_initrd
 	get_rootfs
 	uart="0" timeout="1800" file="linux-oe-rst-bl31.exp" track_expect
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.rst31 b/run_config/fvp-linux.rst31
index 0c83786..21a52bf 100644
--- a/run_config/fvp-linux.rst31
+++ b/run_config/fvp-linux.rst31
@@ -10,4 +10,6 @@
 	initrd_type="default" get_initrd
 	uart="0" file="linux-rd-busybox.exp" track_expect
 	uart="0" set_expect_variable "skip_early_boot_msgs" "1"
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.sgi b/run_config/fvp-linux.sgi
index 3e21807..768f799 100644
--- a/run_config/fvp-linux.sgi
+++ b/run_config/fvp-linux.sgi
@@ -15,4 +15,6 @@
 
 	archive_file "busybox.bin"
 	archive_file "ramdisk.bin"
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.sgm b/run_config/fvp-linux.sgm
index c783867..7b10720 100644
--- a/run_config/fvp-linux.sgm
+++ b/run_config/fvp-linux.sgm
@@ -9,4 +9,6 @@
 	kernel_type="fvp-sgm-kernel" get_kernel
 	initrd_type="fvp-sgm-ramdisk" get_initrd
 	uart="0" file="linux-rd-busybox.exp" track_expect
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.stress b/run_config/fvp-linux.stress
index 2c4b200..3efcf7f 100644
--- a/run_config/fvp-linux.stress
+++ b/run_config/fvp-linux.stress
@@ -12,4 +12,6 @@
 
 	tmp_dir="$(mktempdir)"
 	ln -s "${img_file:?}" "$archive/rootfs.bin"
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.tc0 b/run_config/fvp-linux.tc0
index bcad33b..09eea98 100644
--- a/run_config/fvp-linux.tc0
+++ b/run_config/fvp-linux.tc0
@@ -9,4 +9,6 @@
 	kernel_type="fvp-tc-kernel" get_kernel
 	initrd_type="fvp-tc-ramdisk" get_initrd
 	uart="1" set_primary="1" file="linux-rd-busybox.exp" track_expect
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux.uefi.busybox b/run_config/fvp-linux.uefi.busybox
index 36c92c1..4e63c3e 100644
--- a/run_config/fvp-linux.uefi.busybox
+++ b/run_config/fvp-linux.uefi.busybox
@@ -11,4 +11,6 @@
 	busybox_prebuilt=$css_downloads/sgi/sgi575
 	url="$busybox_prebuilt/grub-busybox.img" saveas="rootfs.bin" fetch_file
 	archive_file "rootfs.bin"
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux32 b/run_config/fvp-linux32
index 9a0936c..8d875db 100644
--- a/run_config/fvp-linux32
+++ b/run_config/fvp-linux32
@@ -9,4 +9,6 @@
 	kernel_type="fvp-aarch32-zimage" get_kernel
 	initrd_type="aarch32-ramdisk" get_initrd
 	uart="0" file="linux-rd-busybox-aarch32.exp" track_expect
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux32.rstspmin b/run_config/fvp-linux32.rstspmin
index f51aa19..36ecb1c 100644
--- a/run_config/fvp-linux32.rstspmin
+++ b/run_config/fvp-linux32.rstspmin
@@ -10,4 +10,6 @@
 	initrd_type="aarch32-ramdisk" get_initrd
 	uart="0" file="linux-rd-busybox-aarch32.exp" track_expect
 	uart="0" set_expect_variable "skip_early_boot_msgs" "1"
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-linux32.stress b/run_config/fvp-linux32.stress
index e36458f..8617a6b 100644
--- a/run_config/fvp-linux32.stress
+++ b/run_config/fvp-linux32.stress
@@ -12,4 +12,6 @@
 
 	tmp_dir="$(mktempdir)"
 	ln -s "${img_file:?}" "$archive/rootfs.bin"
+
+	payload_type="linux" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-tftf.aarch32 b/run_config/fvp-tftf.aarch32
index 0a55b97..61a7831 100644
--- a/run_config/fvp-tftf.aarch32
+++ b/run_config/fvp-tftf.aarch32
@@ -8,4 +8,6 @@
 fetch_tf_resource() {
 	uart="0" file="tftf-aarch32.exp" track_expect
 	uart="1" file="hold_uart.exp" track_expect
+
+	payload_type="tftf" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-tftf.aarch32+fwu b/run_config/fvp-tftf.aarch32+fwu
index 690c4b2..891985a 100644
--- a/run_config/fvp-tftf.aarch32+fwu
+++ b/run_config/fvp-tftf.aarch32+fwu
@@ -25,4 +25,6 @@
 
 fetch_tf_resource() {
 	uart="0" timeout="900" file="tftf-aarch32.exp" track_expect
+
+	payload_type="tftf" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-tftf.cactus_mm b/run_config/fvp-tftf.cactus_mm
index bef713e..fd0b529 100644
--- a/run_config/fvp-tftf.cactus_mm
+++ b/run_config/fvp-tftf.cactus_mm
@@ -20,4 +20,6 @@
 	uart="0" file="tftf.exp" track_expect
 	uart="1" file="hold_uart.exp" track_expect
 	uart="2" file="hold_uart.exp" track_expect
+
+	payload_type="tftf" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-tftf.fault b/run_config/fvp-tftf.fault
index 72c200c..d18ad08 100644
--- a/run_config/fvp-tftf.fault
+++ b/run_config/fvp-tftf.fault
@@ -9,4 +9,6 @@
 	# Hold UART0 but expect fault messages in UART1
 	uart="0" file="hold_uart.exp" track_expect
 	uart="1" set_primary="1" file="tftf_fault.exp" track_expect
+
+	payload_type="tftf" gen_fvp_yaml_template
 }
diff --git a/run_config/fvp-tftf.fwu b/run_config/fvp-tftf.fwu
index 1352f28..43728d6 100644
--- a/run_config/fvp-tftf.fwu
+++ b/run_config/fvp-tftf.fwu
@@ -25,4 +25,6 @@
 
 fetch_tf_resource() {
 	uart="0" timeout="900" file="tftf.exp" track_expect
+
+	payload_type="tftf" gen_fvp_yaml_template
 }