diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 522905d..65a1edd 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -5,14 +5,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-# Generate a FVP-Linux model agnostic YAML template. Note that this template is not ready to be
-# sent to LAVA by Jenkins so in order to produce file, variables in ${UPPERCASE} must be replaced
-# to correct values
+# Generate a FVP-TFTF model agnostic YAML template. Note that this template
+# is not ready to be sent to LAVA by Jenkins. So in order to produce complete
+# file, variables in {UPPERCASE} must be replaced to correct values. This
+# file also includes references to ${UPPERCASE} which are just normal shell
+# variables, replaced on spot.
 
 cat <<EOF
 metadata:
   test_config: {TEST_CONFIG}
   fvp_model: {MODEL}
+  build_url: ${BUILD_URL}
 
 device_type: fvp
 job_name: fvp-linux-{TEST_CONFIG}
diff --git a/script/gen_fvp_tftf_yaml.sh b/script/gen_fvp_tftf_yaml.sh
index 95c9e62..cf85989 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -5,14 +5,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-# Generate a FVP-TFTF model agnostic YAML template. Note that this template is not ready to be
-# sent to LAVA by Jenkins so in order to produce file, variables in ${UPPERCASE} must be replaced
-# to correct values
+# Generate a FVP-TFTF model agnostic YAML template. Note that this template
+# is not ready to be sent to LAVA by Jenkins. So in order to produce complete
+# file, variables in {UPPERCASE} must be replaced to correct values. This
+# file also includes references to ${UPPERCASE} which are just normal shell
+# variables, replaced on spot.
 
 cat <<EOF
 metadata:
   test_config: {TEST_CONFIG}
   fvp_model: {MODEL}
+  build_url: ${BUILD_URL}
 
 device_type: fvp
 job_name: {TEST_CONFIG}