diff --git a/script/lava-templates/juno-linux.yaml b/script/lava-templates/juno-linux.yaml
index 13a3038..111f04b 100644
--- a/script/lava-templates/juno-linux.yaml
+++ b/script/lava-templates/juno-linux.yaml
@@ -1,5 +1,5 @@
 device_type: juno
-job_name: tf-juno
+job_name: juno-linux-${test_config}
 
 context:
   bootloader_prompt: $bootloader_prompt
diff --git a/script/lava-templates/juno-tftf.yaml b/script/lava-templates/juno-tftf.yaml
index 9eae847..eb39e4b 100644
--- a/script/lava-templates/juno-tftf.yaml
+++ b/script/lava-templates/juno-tftf.yaml
@@ -1,5 +1,5 @@
 device_type: juno
-job_name: tf-juno
+job_name: ${test_config}
 
 $tags
 $juno_revision