diff --git a/script/gen_fvp_linux_yaml.sh b/script/gen_fvp_linux_yaml.sh
index 65a1edd..2b6f152 100755
--- a/script/gen_fvp_linux_yaml.sh
+++ b/script/gen_fvp_linux_yaml.sh
@@ -11,11 +11,14 @@
 # file also includes references to ${UPPERCASE} which are just normal shell
 # variables, replaced on spot.
 
+. $(dirname $0)/gen_gerrit_meta.sh
+
 cat <<EOF
 metadata:
   test_config: {TEST_CONFIG}
   fvp_model: {MODEL}
   build_url: ${BUILD_URL}
+${gerrit_meta}
 
 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 cf85989..645492f 100755
--- a/script/gen_fvp_tftf_yaml.sh
+++ b/script/gen_fvp_tftf_yaml.sh
@@ -11,11 +11,14 @@
 # file also includes references to ${UPPERCASE} which are just normal shell
 # variables, replaced on spot.
 
+. $(dirname $0)/gen_gerrit_meta.sh
+
 cat <<EOF
 metadata:
   test_config: {TEST_CONFIG}
   fvp_model: {MODEL}
   build_url: ${BUILD_URL}
+${gerrit_meta}
 
 device_type: fvp
 job_name: {TEST_CONFIG}
diff --git a/script/gen_gerrit_meta.sh b/script/gen_gerrit_meta.sh
new file mode 100644
index 0000000..ab58ccb
--- /dev/null
+++ b/script/gen_gerrit_meta.sh
@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2021 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+# Generate Gerrit-related metadata for LAVA job definitions. This is
+# include file is supposed to be sourced from gen_*_yaml.sh files.
+
+if [ -n "${GERRIT_REFSPEC}" ]; then
+    gerrit_url=$(echo ${GERRIT_REFSPEC} |  awk -F/ '{print "https://review.trustedfirmware.org/c/" $4 "/" $5}')
+
+    gerrit_meta="\
+  gerrit_project: ${GERRIT_PROJECT}
+  gerrit_branch: ${GERRIT_BRANCH}
+  gerrit_url: ${gerrit_url}"
+fi