diff --git a/fvp_utils.sh b/fvp_utils.sh
index 1a789d6..0fa0484 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -366,11 +366,17 @@
     prompt2='root@genericarmv8:~#'
     version_string="\"Fast Models"' [^\\n]+'"\""
 
+    test_config="${TEST_CONFIG}"
+
     # arrays that relates variables and template macros
     # NOTE: any addition on these arrays, requires an addition in the
     # fvp templates
+    declare -A metadata_macros
     declare -A yaml_macros
     declare -A artefacts_macros
+    metadata_macros=(
+        [test_config]="{TEST_CONFIG}"
+    )
     yaml_macros=(
         [armlmd_license_file]="{ARMLMD_LICENSE_FILE}"
         [docker_name]="{BOOT_DOCKER_NAME}"
@@ -528,6 +534,11 @@
     cp "${yaml_template_file}" "${yaml_file}"
     cp "$archive/model_params" "$lava_model_params"
 
+    # replace metadata macros with real values
+    for m in "${!metadata_macros[@]}"; do
+        sed -i -e "s|${metadata_macros[$m]}|${!m}|" "$yaml_file"
+    done
+
     # replace yaml macros with real values
     for m in "${!yaml_macros[@]}"; do
         sed -i -e "s|${yaml_macros[$m]}|${!m}|" "$yaml_file"
diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index e209978..cbd8d72 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -10,6 +10,9 @@
 # to correct values
 
 cat <<EOF
+metadata:
+  test_config: {TEST_CONFIG}
+
 device_type: fvp
 job_name: fvp-linux-{MODEL}
 
diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index 9af659a..caf1d0a 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -10,6 +10,9 @@
 # to correct values
 
 cat <<EOF
+metadata:
+  test_config: {TEST_CONFIG}
+
 device_type: fvp
 job_name: fvp-tftf-{MODEL}