diff --git a/fvp_utils.sh b/fvp_utils.sh
index 5062e5d..010af08 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -299,6 +299,7 @@
         -e "s|\${BOOT_IMAGE_DIR}|${model_dir}|" \
         -e "s|\${BOOT_IMAGE_BIN}|${model_bin}|" \
         -e "s|\${BOOT_VERSION_STRING}|${version_string}|" \
+        -e "s|\${MODEL}|${model}|" \
         < "$yaml_template_file" \
         > "$yaml_file"
 
diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 08b9792..526f280 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -11,7 +11,7 @@
 
 cat <<EOF
 device_type: fvp
-job_name: fvp-linux
+job_name: fvp-linux-\${MODEL}
 
 timeouts:
   connection:
diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index 9821102..487cba5 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -11,7 +11,7 @@
 
 cat <<EOF
 device_type: fvp
-job_name: fvp-tftf
+job_name: fvp-tftf-\${MODEL}
 
 timeouts:
   connection: