diff --git a/lava_helper/jinja2_templates/base.jinja2 b/lava_helper/jinja2_templates/base.jinja2
index d3159fa..8e88e35 100644
--- a/lava_helper/jinja2_templates/base.jinja2
+++ b/lava_helper/jinja2_templates/base.jinja2
@@ -14,6 +14,7 @@
   platform: {{ platform }}
   build_name: {{ build_name }}
   recovery_image_url: {{ recovery_image_url }}
+  device_type: {{ device_type }}
   build_job_url: {{ build_job_url }}
 {%- endblock %}
 
diff --git a/lava_helper/jinja2_templates/lpcxpresso55s69.jinja2 b/lava_helper/jinja2_templates/lpcxpresso55s69.jinja2
index 1a3209d..5de0d9b 100644
--- a/lava_helper/jinja2_templates/lpcxpresso55s69.jinja2
+++ b/lava_helper/jinja2_templates/lpcxpresso55s69.jinja2
@@ -1,5 +1,5 @@
 {#------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -43,5 +43,6 @@
   name: {{ name }}
   platform: {{ platform }}
   build_name: {{ build_name }}
+  device_type: {{ device_type }}
   build_job_url: {{ build_job_url }}
 {% endblock %}
diff --git a/lava_helper/jinja2_templates/musca_b1.jinja2 b/lava_helper/jinja2_templates/musca_b1.jinja2
index 0b69e95..5233e95 100644
--- a/lava_helper/jinja2_templates/musca_b1.jinja2
+++ b/lava_helper/jinja2_templates/musca_b1.jinja2
@@ -1,5 +1,5 @@
 {#------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -43,5 +43,6 @@
   name: {{ name }}
   platform: {{ platform }}
   build_name: {{ build_name }}
+  device_type: {{ device_type }}
   build_job_url: {{ build_job_url }}
 {% endblock %}
diff --git a/lava_helper/jinja2_templates/psoc64.jinja2 b/lava_helper/jinja2_templates/psoc64.jinja2
index 651efee..e89c9f0 100644
--- a/lava_helper/jinja2_templates/psoc64.jinja2
+++ b/lava_helper/jinja2_templates/psoc64.jinja2
@@ -1,5 +1,5 @@
 {#------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -42,5 +42,6 @@
   name: {{ name }}
   platform: {{ platform }}
   build_name: {{ build_name }}
+  device_type: {{ device_type }}
   build_job_url: {{ build_job_url }}
 {% endblock %}
diff --git a/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2 b/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2
index e7c7a54..644b6c4 100644
--- a/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2
+++ b/lava_helper/jinja2_templates/qemu_mps2_bl2.jinja2
@@ -65,6 +65,7 @@
   name: {{ name }}
   platform: {{ platform }}
   build_name: {{ build_name }}
+  device_type: {{ device_type }}
   build_job_url: {{ build_job_url }}
   firmware_url: {{ firmware_url }}
   bootloader_url: {{ bootloader_url }}
diff --git a/lava_helper/jinja2_templates/stm32l562e_dk.jinja2 b/lava_helper/jinja2_templates/stm32l562e_dk.jinja2
index af9f19f..dbe9bcb 100644
--- a/lava_helper/jinja2_templates/stm32l562e_dk.jinja2
+++ b/lava_helper/jinja2_templates/stm32l562e_dk.jinja2
@@ -1,5 +1,5 @@
 {#------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -43,5 +43,6 @@
   name: {{ name }}
   platform: {{ platform }}
   build_name: {{ build_name }}
+  device_type: {{ device_type }}
   build_job_url: {{ build_job_url }}
 {% endblock %}
diff --git a/lava_helper/lava_create_jobs.py b/lava_helper/lava_create_jobs.py
index 207a9a5..ce14d24 100755
--- a/lava_helper/lava_create_jobs.py
+++ b/lava_helper/lava_create_jobs.py
@@ -35,19 +35,6 @@
     return "{}/{}".format(recovery_store_url.rstrip('/'), recovery)
 
 
-def get_job_name(name, params, job):
-    return "{}_{}_{}_{}_{}_{}_{}_{}".format(
-        name,
-        job,
-        params["platform"],
-        params["build_no"],
-        params["compiler"],
-        params["build_type"],
-        params["boot_type"],
-        params["name"],
-    )
-
-
 def load_config_overrides(user_args, config_key):
     """Load a configuration from multiple locations and override it with user provided
     arguments"""
@@ -133,9 +120,7 @@
                             )
                         params.update(
                             {
-                                "job_name": get_job_name(
-                                    config["job_name"], params, user_args.jenkins_job,
-                                ),
+                                "job_name": "{}_{}_{}".format(os.getenv('CONFIG_NAME'), params['build_no'], params["device_type"]),
                                 "build_name": os.getenv('CONFIG_NAME')
                             }
                         )
diff --git a/lava_helper/lava_wait_jobs.py b/lava_helper/lava_wait_jobs.py
index 789fae2..80bd3fd 100755
--- a/lava_helper/lava_wait_jobs.py
+++ b/lava_helper/lava_wait_jobs.py
@@ -71,10 +71,9 @@
 
 def process_finished_jobs(finished_jobs, user_args):
     print_lava_urls(finished_jobs, user_args)
-    job_links(finished_jobs, user_args)
-    boot_report(finished_jobs, user_args)
     test_report(finished_jobs, user_args)
     failure_report(finished_jobs, user_args)
+    job_links(finished_jobs, user_args)
     csv_report(finished_jobs)
     codecov_helper.coverage_reports(finished_jobs, user_args)
 
@@ -123,8 +122,8 @@
         target_log = os.path.join(job_dir, 'target_log.txt')
         config = os.path.join(job_dir, 'config.tar.bz2')
         results_file = os.path.join(job_dir, 'results.yaml')
-        definition, metadata = lava.get_job_definition(job_id, def_path)
-        jobs[job_id]['metadata'] = metadata
+        definition = lava.get_job_definition(job_id, def_path)
+        jobs[job_id]['metadata'] = definition.get('metadata', [])
         time.sleep(0.2) # be friendly to LAVA
         lava.get_job_log(job_id, target_log)
         time.sleep(0.2)
@@ -147,10 +146,13 @@
 def job_links(jobs, user_args):
     job_links = ""
     for job, info in jobs.items():
-        job_links += "Build Config: {}\n".format(info['metadata']['build_name'])
+        job_links += "\nLAVA Test Config:\n"
+        job_links += "Config Name: {}\n".format(info['metadata']['build_name'])
+        job_links += "Test Result: {}\n".format(info['result'])
+        job_links += "Device Type: {}\n".format(info['metadata']['device_type'])
         job_links += "Build link: {}\n".format(info['metadata']['build_job_url'])
         job_links += "LAVA link: {}\n".format(lava_id_to_url(job, user_args))
-        job_links += "TFM LOG: {}artifact/{}/target_log.txt\n\n".format(os.getenv("BUILD_URL"), info['job_dir'])
+        job_links += "TFM LOG: {}artifact/{}/target_log.txt\n".format(os.getenv("BUILD_URL"), info['job_dir'])
     print(job_links)
 
 def csv_report(jobs):
@@ -183,18 +185,6 @@
         writer.writeheader()
         writer.writerows(lava_jobs)
 
-def boot_report(jobs, user_args):
-    incomplete_jobs = []
-    for job, info in jobs.items():
-        if info['health'] != 'Complete':
-            if info['error_reason'] == 'Infrastructure':
-                info_print("Job {} failed with Infrastructure error".format(job))
-            incomplete_jobs.append(job)
-    incomplete_output = [lava_id_to_url(x, user_args) for x in incomplete_jobs];
-    if len(incomplete_jobs) > 0:
-        print("BOOT_RESULT: -1 Failed: {}".format(incomplete_output))
-    else:
-        print("BOOT_RESULT: +1")
 
 def failure_report(jobs, user_args):
     failed_report = "FAILURE_TESTS:"
@@ -203,6 +193,9 @@
             failed_report += " {}:{}artifact/{}/target_log.txt\n".format(info['metadata']['build_name'],
                                                                          os.getenv("BUILD_URL"),
                                                                          info['job_dir'])
+            info['result'] = 'FAILURE'
+        else:
+            info['result'] = 'SUCCESS'
     print(failed_report)
 
 def remove_lava_dupes(results):
@@ -220,6 +213,9 @@
     fail_j = []
     jinja_data = []
     for job, info in jobs.items():
+        if info['health'] != 'Complete':
+            fail_j.append(job)
+            continue
         results_file = os.path.join(info['job_dir'], 'results.yaml')
         if not os.path.exists(results_file) or (os.path.getsize(results_file) == 0):
             fail_j.append(job)
@@ -235,11 +231,6 @@
             if result['result'] == 'fail':
                 fail_j.append(job) if job not in fail_j else fail_j
         time.sleep(0.5) # be friendly to LAVA
-    fail_output = [lava_id_to_url(x, user_args) for x in fail_j]
-    if len(fail_j) > 0:
-        print("TEST_RESULT: -1 Failed: {}".format(fail_output))
-    else:
-        print("TEST_RESULT: +1")
     data = {}
     data['jobs'] = jinja_data
     render_jinja(data)