diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 0d29d56..522905d 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -12,9 +12,10 @@
 cat <<EOF
 metadata:
   test_config: {TEST_CONFIG}
+  fvp_model: {MODEL}
 
 device_type: fvp
-job_name: fvp-linux-{MODEL}
+job_name: fvp-linux-{TEST_CONFIG}
 
 timeouts:
   connection:
diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index 74bf8b6..95c9e62 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -12,9 +12,10 @@
 cat <<EOF
 metadata:
   test_config: {TEST_CONFIG}
+  fvp_model: {MODEL}
 
 device_type: fvp
-job_name: fvp-tftf-{MODEL}
+job_name: {TEST_CONFIG}
 
 timeouts:
   job: