diff --git a/modules/test/tls/python/src/tls_module.py b/modules/test/tls/python/src/tls_module.py
index ca7bed260..ace90ceaf 100644
--- a/modules/test/tls/python/src/tls_module.py
+++ b/modules/test/tls/python/src/tls_module.py
@@ -25,15 +25,16 @@
 from cryptography.hazmat.primitives.asymmetric import rsa, dsa, ec
 from cryptography.x509 import AuthorityKeyIdentifier, SubjectKeyIdentifier, BasicConstraints, KeyUsage
 from cryptography.x509 import GeneralNames, DNSName, ExtendedKeyUsage, ObjectIdentifier, SubjectAlternativeName
+from jinja2 import Environment, FileSystemLoader
 
 LOG_NAME = 'test_tls'
-MODULE_REPORT_FILE_NAME = 'tls_report.html'
+MODULE_REPORT_FILE_NAME = 'tls_report.j2.html'
 STARTUP_CAPTURE_FILE = '/runtime/device/startup.pcap'
 MONITOR_CAPTURE_FILE = '/runtime/device/monitor.pcap'
 TLS_CAPTURE_FILE = '/runtime/output/tls.pcap'
 GATEWAY_CAPTURE_FILE = '/runtime/network/gateway.pcap'
 LOGGER = None
-
+REPORT_TEMPLATE_FILE = 'report_template.jinja2'
 
 class TLSModule(TestModule):
   """The TLS testing module."""
@@ -57,7 +58,24 @@ def __init__(self,
     self._tls_util = TLSUtil(LOGGER)
 
   def generate_module_report(self):
-    html_content = '<h4 class="page-heading">TLS Module</h4>'
+    # Load Jinja2 template
+    loader=FileSystemLoader(self._report_template_folder)
+    template = Environment(loader=loader).get_template(REPORT_TEMPLATE_FILE)
+    module_header='TLS Module'
+    # Summary table headers
+    summary_headers = [
+                        'Expiry',
+                        'Length',
+                        'Type',
+                        'Port number',
+                        'Signed by',
+                        ]
+    # Cert table headers
+    cert_table_headers = ['Property', 'Value']
+    # Outbound connections table headers
+    outbound_headers = ['Destination IP', 'Port']
+    pages = {}
+    outbound_conns = None
 
     # List of capture files to scan
     pcap_files = [
@@ -66,39 +84,12 @@ def generate_module_report(self):
     ]
     certificates = self.extract_certificates_from_pcap(pcap_files,
                                                        self._device_mac)
-
     if len(certificates) > 0:
 
-      cert_tables = []
       # pylint: disable=W0612
       for cert_num, ((ip_address, port),
                      cert) in enumerate(certificates.items()):
-
-        # Add summary table
-        summary_table = '''
-          <table class="module-summary" style="width:100%;">
-            <thead>
-              <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
-              </tr>
-            </thead>
-            <tbody>
-          '''
-
-        # Generate the certificate table
-        cert_table = '''
-          <table class="module-data">
-            <thead>
-              <tr>
-                <th>Property</th>
-                <th>Value</th>
-              </tr>
-            </thead>
-            <tbody>'''
+        pages[cert_num] = {}
 
         # Extract certificate data
         not_valid_before = cert.not_valid_before
@@ -124,50 +115,18 @@ def generate_module_report(self):
             cert.public_bytes(encoding=serialization.Encoding.DER))
 
         # Append certification information
-        cert_table += f'''
-          <tr>
-            <td>Version</td>
-            <td>{version_value}</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>{signature_alg_value}</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>{not_before}</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>{not_after}</td>
-          </tr>
-        </tbody>
-      </table>
-        '''
-
-        subject_table = '''
-          <table class="module-data">
-            <thead>
-              <tr>
-                <th>Property</th>
-                <th>Value</th>
-              </tr>
-            </thead>
-            <tbody>'''
+        pages[cert_num]['cert_info_data'] = {
+                            'Version': version_value,
+                            'Signature Alg.': signature_alg_value,
+                            'Validity from': not_before,
+                            'Valid to': not_after,
+                          }
 
         # Append the subject information
+        pages[cert_num]['subject_data'] = {}
         for val in cert.subject.rdns:
           dn = val.rfc4514_string().split('=')
-          subject_table += f'''
-            <tr>
-              <td>{dn[0]}</td>
-              <td>{dn[1]}</td>
-            </tr>
-          '''
-
-        subject_table += '''
-          </tbody>
-        </table>'''
+          pages[cert_num]['subject_data'][dn[0]] = dn[1]
 
         # Append issuer information
         for val in cert.issuer.rdns:
@@ -175,102 +134,72 @@ def generate_module_report(self):
           if 'CN' in dn[0]:
             signed_by = dn[1]
 
-        ext_table = ''
-
         # Append extensions information
         if cert.extensions:
-
-          ext_table = '''
-            <h5>Certificate Extensions</h5>
-            <table class="module-data" style="margin-bottom:20px;">
-              <thead>
-                <tr>
-                  <th>Property</th>
-                  <th>Value</th>
-                </tr>
-              </thead>
-              <tbody>'''
-
+          pages[cert_num]['cert_ext'] = {}
           for extension in cert.extensions:
             if isinstance(extension.value, list):
               for extension_value in extension.value:
-                ext_table += f'''
-                    <tr>
-                      <td>{extension.oid._name}</td> 
-                      <td>{self.format_extension_value(extension_value.value)}</td>
-                    </tr> 
-                  '''
+                extension_name = extension.oid._name
+                formatted_value = self.format_extension_value(
+                  extension_value.value)
+                pages[cert_num]['cert_ext'][extension_name] = formatted_value
             else:
-              ext_table += f'''
-                    <tr>
-                      <td>{extension.oid._name}</td> 
-                      <td>{self.format_extension_value(extension.value)}</td>
-                    </tr> 
-                  '''
-
-          ext_table += '''
-            </tbody>
-          </table>'''
-
-        # Add summary table row
-        summary_table += f'''
-              <tr>
-                <td>{not_after}</td>
-                <td>{cert_length}</td>
-                <td>{public_key_type}</td>
-                <td>{port}</td>
-                <td>{signed_by}</td>
-              </tr>
-            </tbody>
-          </table>
-        '''
-
-        # Merge all table HTML
-        summary_table = f'\n{summary_table}'
-
-        summary_table += f'''
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
-            {cert_table}
-          </div>
-          <div>
-            <h5>Subject Information</h5>
-            {subject_table}
-          </div>
-        </div>'''
-
-        if ext_table is not None:
-          summary_table += f'\n\n{ext_table}'
-
-        cert_tables.append(summary_table)
+              formatted_value = self.format_extension_value(
+                  extension.value)
+              pages[cert_num]['cert_ext'][extension.oid._name] = formatted_value
+
+        pages[cert_num]['summary_data'] = [
+                                            not_after,
+                                            cert_length,
+                                            public_key_type,
+                                            port,
+                                            signed_by
+                                          ]
 
       outbound_conns = self._tls_util.get_all_outbound_connections(
           device_mac=self._device_mac, capture_files=pcap_files)
-      conn_table = self.generate_outbound_connection_table(outbound_conns)
-
-      html_content += summary_table + '\n'.join('\n' + tables
-                                                for tables in cert_tables)
-      html_content += conn_table
 
+    report_jinja = ''
+    if pages:
+      for num,page in pages.items():
+        module_header_repr = module_header if num == 0 else None
+        cert_ext=page['cert_ext'] if 'cert_ext' in page else None
+        page_html = template.render(
+                                  base_template=self._base_template_file,
+                                  module_header=module_header_repr,
+                                  summary_headers=summary_headers,
+                                  summary_data=page['summary_data'],
+                                  cert_info_data=page['cert_info_data'],
+                                  subject_data=page['subject_data'],
+                                  cert_table_headers=cert_table_headers,
+                                  cert_ext=cert_ext,
+                                  ountbound_headers=outbound_headers,
+                                )
+        report_jinja += page_html
+      if outbound_conns:
+        out_page = template.render(
+                            base_template=self._base_template_file,
+                            ountbound_headers=outbound_headers,
+                            outbound_conns=outbound_conns
+                          )
+        report_jinja += out_page
     else:
-      html_content += ('''
-        <div class="callout-container info">
-          <div class="icon"></div>
-          No TLS certificates found on the device
-        </div>''')
-
-    LOGGER.debug('Module report:\n' + html_content)
+      report_jinja = template.render(
+                                    base_template=self._base_template_file,
+                                    module_header = module_header,
+                                    )
+    LOGGER.debug('Module report:\n' + report_jinja)
 
     # Use os.path.join to create the complete file path
-    report_path = os.path.join(self._results_dir, MODULE_REPORT_FILE_NAME)
+    jinja_path = os.path.join(self._results_dir, MODULE_REPORT_FILE_NAME)
 
     # Write the content to a file
-    with open(report_path, 'w', encoding='utf-8') as file:
-      file.write(html_content)
+    with open(jinja_path, 'w', encoding='utf-8') as file:
+      file.write(report_jinja)
 
-    LOGGER.info('Module report generated at: ' + str(report_path))
-    return report_path
+    LOGGER.info('Module report generated at: ' + str(jinja_path))
+    return jinja_path
 
   def format_extension_value(self, value):
     if isinstance(value, bytes):
@@ -533,5 +462,5 @@ def _validate_tls_client(self,
 
   def _resolve_device_ip(self):
     # If the ipv4 address wasn't resolved yet, try again
-    if self._device_ipv4_addr is None:
+    if self._device_ipv4_addr is None: # pylint: disable=E0203
       self._device_ipv4_addr = self._get_device_ipv4()
diff --git a/modules/test/tls/resources/report_template.jinja2 b/modules/test/tls/resources/report_template.jinja2
new file mode 100644
index 000000000..e7ddf1cf5
--- /dev/null
+++ b/modules/test/tls/resources/report_template.jinja2
@@ -0,0 +1,90 @@
+{% extends base_template %}
+{% block content %}
+{% if cert_info_data and subject_data %}
+  <div style="display:flex;justify-content:space-between;">
+      <div style="margin-right:20px;">
+        <h5>Certificate Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              {% for header in cert_table_headers%}
+              <th>{{ header }}</th>
+              {% endfor %}
+            </tr>
+          </thead>
+          <tbody>
+            {% for k,v in cert_info_data.items() %}
+              <tr>
+                <td>{{ k }}</td>
+                <td>{{ v }}</td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+      <div>
+        <h5>Subject Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              {% for header in cert_table_headers%}
+              <th>{{ header }}</th>
+              {% endfor %}
+            </tr>
+          </thead>
+          <tbody>
+            {% for k,v in subject_data.items() %}
+              <tr>
+                <td>{{ k }}</td>
+                <td>{{ v }}</td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+          </div>
+        </div>
+        {% if cert_ext %}
+          <h5>Certificate Extensions</h5>
+            <table class="module-data" style="margin-bottom:20px;">
+              <thead>
+                <tr>
+                  <th>Property</th>
+                  <th>Value</th>
+                </tr>
+              </thead>
+              <tbody>
+              {% for k,v in cert_ext.items()%}
+                 <tr>
+                    <td>{{ k }}</td> 
+                    <td>{{ v }}</td>
+                  </tr> 
+              {% endfor %}
+              </tbody>
+            </table>
+        {% endif %}
+{% elif ountbound_headers %}
+  <h1>Outbound Connections</h1>
+    <table class="module-data">
+      <thead>
+          <tr>
+              {% for header in ountbound_headers%}
+                <th>{{ header }}</th>
+              {% endfor %}
+          </tr>
+      </thead>
+      <tbody>
+      {% for ip, port in outbound_conns%}
+        <tr>
+          <td>{{ip}}</td>
+          <td>{{port}}</td>
+        </tr>
+      {% endfor %}
+      </tbody>
+    </table>
+{% else %}
+  <div class="callout-container info">
+    <div class="icon"></div>
+    No TLS certificates found on the device
+  </div> 
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/modules/test/tls/tls.Dockerfile b/modules/test/tls/tls.Dockerfile
index c448c8478..3d6d66544 100644
--- a/modules/test/tls/tls.Dockerfile
+++ b/modules/test/tls/tls.Dockerfile
@@ -51,3 +51,6 @@ RUN pip3 install -r /testrun/python/requirements-test.txt
 
 # Create a directory inside the container to store the root certificates
 RUN mkdir -p /testrun/root_certs
+
+# Copy Jinja template
+COPY $MODULE_DIR/resources/report_template.jinja2 $REPORT_TEMPLATE_PATH/
diff --git a/resources/report/module_report_base.jinja2 b/resources/report/module_report_base.jinja2
index 009b7646d..2f7a02228 100644
--- a/resources/report/module_report_base.jinja2
+++ b/resources/report/module_report_base.jinja2
@@ -25,24 +25,26 @@
   {% if module_header %}
     <h4 class="page-heading">{{ module_header }}</h4>
     <table class="module-summary">
-  {% else %}
+  {% elif summary_headers %}
     <table class="module-summary not-first">
   {% endif %}
-    <thead>
-      <tr>
-        {% for header in summary_headers %}
-          <th>{{ header }}</th>
-        {% endfor %}
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        {% for cell in summary_data %}
-          <td>{{ cell }}</td>
-        {% endfor %}
-      </tr>
-    </tbody>
-    </table>
+    {% if summary_headers %}
+      <thead>
+        <tr>
+          {% for header in summary_headers %}
+            <th>{{ header }}</th>
+          {% endfor %}
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          {% for cell in summary_data %}
+            <td>{{ cell }}</td>
+          {% endfor %}
+        </tr>
+      </tbody>
+      </table>
+    {% endif %}
   {% block content %}{% endblock content %}
 </div>
 {% raw %}
diff --git a/testing/unit/dns/reports/dns_report_local.html b/testing/unit/dns/reports/dns_report_local.html
index 9c4e6c90a..f02b144a0 100644
--- a/testing/unit/dns/reports/dns_report_local.html
+++ b/testing/unit/dns/reports/dns_report_local.html
@@ -26,33 +26,35 @@
     <h4 class="page-heading">DNS Module</h4>
     <table class="module-summary">
   
-    <thead>
-      <tr>
-        
-          <th>Requests to local DNS server</th>
-        
-          <th>Requests to external DNS servers</th>
-        
-          <th>Total DNS requests</th>
-        
-          <th>Total DNS responses</th>
-        
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        
-          <td>71</td>
-        
-          <td>0</td>
-        
-          <td>71</td>
-        
-          <td>84</td>
-        
-      </tr>
-    </tbody>
-    </table>
+    
+      <thead>
+        <tr>
+          
+            <th>Requests to local DNS server</th>
+          
+            <th>Requests to external DNS servers</th>
+          
+            <th>Total DNS requests</th>
+          
+            <th>Total DNS responses</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>71</td>
+          
+            <td>0</td>
+          
+            <td>71</td>
+          
+            <td>84</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
   
 
   <table class="module-data dns-module" style="width:100%;">
diff --git a/testing/unit/dns/reports/dns_report_local_no_dns.html b/testing/unit/dns/reports/dns_report_local_no_dns.html
index f9dee2020..183b8c97a 100644
--- a/testing/unit/dns/reports/dns_report_local_no_dns.html
+++ b/testing/unit/dns/reports/dns_report_local_no_dns.html
@@ -26,33 +26,35 @@
     <h4 class="page-heading">DNS Module</h4>
     <table class="module-summary">
   
-    <thead>
-      <tr>
-        
-          <th>Requests to local DNS server</th>
-        
-          <th>Requests to external DNS servers</th>
-        
-          <th>Total DNS requests</th>
-        
-          <th>Total DNS responses</th>
-        
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-      </tr>
-    </tbody>
-    </table>
+    
+      <thead>
+        <tr>
+          
+            <th>Requests to local DNS server</th>
+          
+            <th>Requests to external DNS servers</th>
+          
+            <th>Total DNS requests</th>
+          
+            <th>Total DNS responses</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
   
 
   <div class="callout-container info">
diff --git a/testing/unit/ntp/reports/ntp_report_local.html b/testing/unit/ntp/reports/ntp_report_local.html
index 89e736e17..d4a6e9d99 100644
--- a/testing/unit/ntp/reports/ntp_report_local.html
+++ b/testing/unit/ntp/reports/ntp_report_local.html
@@ -26,33 +26,35 @@
     <h4 class="page-heading">NTP Module</h4>
     <table class="module-summary">
   
-    <thead>
-      <tr>
-        
-          <th>Requests to local NTP server</th>
-        
-          <th>Requests to external NTP servers</th>
-        
-          <th>Total NTP requests</th>
-        
-          <th>Total NTP responses</th>
-        
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        
-          <td>63</td>
-        
-          <td>38</td>
-        
-          <td>101</td>
-        
-          <td>104</td>
-        
-      </tr>
-    </tbody>
-    </table>
+    
+      <thead>
+        <tr>
+          
+            <th>Requests to local NTP server</th>
+          
+            <th>Requests to external NTP servers</th>
+          
+            <th>Total NTP requests</th>
+          
+            <th>Total NTP responses</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>63</td>
+          
+            <td>38</td>
+          
+            <td>101</td>
+          
+            <td>104</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
   
 
   <table class="module-data" style="width:100%;">
diff --git a/testing/unit/ntp/reports/ntp_report_local_no_ntp.html b/testing/unit/ntp/reports/ntp_report_local_no_ntp.html
index abe616a38..a47d73614 100644
--- a/testing/unit/ntp/reports/ntp_report_local_no_ntp.html
+++ b/testing/unit/ntp/reports/ntp_report_local_no_ntp.html
@@ -26,33 +26,35 @@
     <h4 class="page-heading">NTP Module</h4>
     <table class="module-summary">
   
-    <thead>
-      <tr>
-        
-          <th>Requests to local NTP server</th>
-        
-          <th>Requests to external NTP servers</th>
-        
-          <th>Total NTP requests</th>
-        
-          <th>Total NTP responses</th>
-        
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-      </tr>
-    </tbody>
-    </table>
+    
+      <thead>
+        <tr>
+          
+            <th>Requests to local NTP server</th>
+          
+            <th>Requests to external NTP servers</th>
+          
+            <th>Total NTP requests</th>
+          
+            <th>Total NTP responses</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
   
 
   <div class="callout-container info">
diff --git a/testing/unit/services/reports/services_report_all_closed_local.html b/testing/unit/services/reports/services_report_all_closed_local.html
index 01ac50676..f2c20aef0 100644
--- a/testing/unit/services/reports/services_report_all_closed_local.html
+++ b/testing/unit/services/reports/services_report_all_closed_local.html
@@ -26,29 +26,31 @@
     <h4 class="page-heading">Services Module</h4>
     <table class="module-summary">
   
-    <thead>
-      <tr>
-        
-          <th>TCP ports open</th>
-        
-          <th>UDP ports open</th>
-        
-          <th>Total ports open</th>
-        
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-          <td>0</td>
-        
-      </tr>
-    </tbody>
-    </table>
+    
+      <thead>
+        <tr>
+          
+            <th>TCP ports open</th>
+          
+            <th>UDP ports open</th>
+          
+            <th>Total ports open</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+            <td>0</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
   
 
   <div class="callout-container info">
diff --git a/testing/unit/services/reports/services_report_local.html b/testing/unit/services/reports/services_report_local.html
index 71f929aeb..899bb4692 100644
--- a/testing/unit/services/reports/services_report_local.html
+++ b/testing/unit/services/reports/services_report_local.html
@@ -26,29 +26,31 @@
     <h4 class="page-heading">Services Module</h4>
     <table class="module-summary">
   
-    <thead>
-      <tr>
-        
-          <th>TCP ports open</th>
-        
-          <th>UDP ports open</th>
-        
-          <th>Total ports open</th>
-        
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        
-          <td>3</td>
-        
-          <td>0</td>
-        
-          <td>3</td>
-        
-      </tr>
-    </tbody>
-    </table>
+    
+      <thead>
+        <tr>
+          
+            <th>TCP ports open</th>
+          
+            <th>UDP ports open</th>
+          
+            <th>Total ports open</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>3</td>
+          
+            <td>0</td>
+          
+            <td>3</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
   
 
   <table class="module-data">
diff --git a/testing/unit/tls/reports/tls_report_ext_local.html b/testing/unit/tls/reports/tls_report_ext_local.html
index bde424a0e..88a1033af 100644
--- a/testing/unit/tls/reports/tls_report_ext_local.html
+++ b/testing/unit/tls/reports/tls_report_ext_local.html
@@ -1,186 +1,134 @@
-<h4 class="page-heading">TLS Module</h4>
 
-          <table class="module-summary" style="width:100%;">
-            <thead>
-              <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
-              </tr>
-            </thead>
-            <tbody>
+  <div class="page">
+    <div class="header">
+    <div class="header-info">
+      {# Badge #}
+      <p class="header-info-badge">
+        {% if json_data['device']['test_pack'] == 'Device Qualification' %}
+          <img src="data:image/png;base64, {{ icon_qualification }}" alt="">
+          <span>Device Qualification</span>
+        {% else %}
+          <img src="data:image/png;base64, {{ icon_pilot }}" alt="">
+          <span>Pilot Assessment</span>
+        {% endif %}
+      </p>
+      <span style="font-weight:600">{{ title }}</span>
+    </div>
+    <span style="margin-top:0;max-width:700px;font-size:24px;font-weight:600;"> 
+      {{ device['manufacturer'] }}
+      {{ device['model']}}
+    </span> 
+    <img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
+  </div>
+
+<div class="module-page-content">
+  
+    <h4 class="page-heading">TLS Module</h4>
+    <table class="module-summary">
+  
+    
+      <thead>
+        <tr>
           
-              <tr>
-                <td>2027-07-25 15:33:09</td>
-                <td>888</td>
-                <td>EC</td>
-                <td>443</td>
-                <td>Sub CA</td>
-              </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
+            <th>Expiry</th>
+          
+            <th>Length</th>
+          
+            <th>Type</th>
+          
+            <th>Port number</th>
+          
+            <th>Signed by</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>2027-07-25 15:33:09</td>
+          
+            <td>888</td>
+          
+            <td>EC</td>
+          
+            <td>443</td>
+          
+            <td>Sub CA</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
+  
+
+  <div style="display:flex;justify-content:space-between;">
+      <div style="margin-right:20px;">
+        <h5>Certificate Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Version</td>
+                <td>3 (0x2)</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>3 (0x2)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>sha256WithRSAEncryption</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2022-07-26 15:33:09</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2027-07-25 15:33:09</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Signature Alg.</td>
+                <td>sha256WithRSAEncryption</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>CN</td>
-              <td>apc27D605.nam.gad.schneider-electric.com</td>
-            </tr>
-          
-          </tbody>
-        </table>
-          </div>
-        </div>
-
-
-            <h5>Certificate Extensions</h5>
-            <table class="module-data" style="margin-bottom:20px;">
-              <thead>
-                <tr>
-                  <th>Property</th>
-                  <th>Value</th>
-                </tr>
-              </thead>
-              <tbody>
-                    <tr>
-                      <td>subjectAltName</td> 
-                      <td>ap9643_qa1941270129.nam.gad.schneider-electric.com</td>
-                    </tr> 
-                  
-            </tbody>
-          </table>
-
-
-          <table class="module-summary" style="width:100%;">
-            <thead>
+            
               <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
+                <td>Validity from</td>
+                <td>2022-07-26 15:33:09</td>
               </tr>
-            </thead>
-            <tbody>
-          
+            
               <tr>
+                <td>Valid to</td>
                 <td>2027-07-25 15:33:09</td>
-                <td>888</td>
-                <td>EC</td>
-                <td>443</td>
-                <td>Sub CA</td>
               </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
             
-          <table class="module-data">
-            <thead>
+          </tbody>
+        </table>
+      </div>
+      <div>
+        <h5>Subject Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>C</td>
+                <td>US</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>3 (0x2)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>sha256WithRSAEncryption</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2022-07-26 15:33:09</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2027-07-25 15:33:09</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>CN</td>
+                <td>apc27D605.nam.gad.schneider-electric.com</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>CN</td>
-              <td>apc27D605.nam.gad.schneider-electric.com</td>
-            </tr>
-          
+            
           </tbody>
         </table>
           </div>
         </div>
-
-
-            <h5>Certificate Extensions</h5>
+        
+          <h5>Certificate Extensions</h5>
             <table class="module-data" style="margin-bottom:20px;">
               <thead>
                 <tr>
@@ -189,24 +137,22 @@ <h5>Certificate Extensions</h5>
                 </tr>
               </thead>
               <tbody>
-                    <tr>
-                      <td>subjectAltName</td> 
-                      <td>ap9643_qa1941270129.nam.gad.schneider-electric.com</td>
-                    </tr> 
-                  
-            </tbody>
-          </table>
-    <h1>Outbound Connections</h1>
-    <table class="module-data">
-      <thead>
-          <tr>
-              <th>Destination IP</th>
-              <th>Port</th>
-          </tr>
-      </thead>
-    <tbody>
-    
-    </tbody>
-    
-</table>
-    
\ No newline at end of file
+              
+                 <tr>
+                    <td>subjectAltName</td> 
+                    <td>ap9643_qa1941270129.nam.gad.schneider-electric.com</td>
+                  </tr> 
+              
+              </tbody>
+            </table>
+        
+
+
+</div>
+
+<div class="footer">
+    <div class="footer-label">Testrun {{ version }}</div>
+    <div class="footer-label page-index" style="right: 0px"></div>
+  </div>
+  </div>
+  <div style="break-after:page"></div>
diff --git a/testing/unit/tls/reports/tls_report_local.html b/testing/unit/tls/reports/tls_report_local.html
index 4d1af0404..810745253 100644
--- a/testing/unit/tls/reports/tls_report_local.html
+++ b/testing/unit/tls/reports/tls_report_local.html
@@ -1,231 +1,149 @@
-<h4 class="page-heading">TLS Module</h4>
 
-          <table class="module-summary" style="width:100%;">
-            <thead>
+  <div class="page">
+    <div class="header">
+    <div class="header-info">
+      {# Badge #}
+      <p class="header-info-badge">
+        {% if json_data['device']['test_pack'] == 'Device Qualification' %}
+          <img src="data:image/png;base64, {{ icon_qualification }}" alt="">
+          <span>Device Qualification</span>
+        {% else %}
+          <img src="data:image/png;base64, {{ icon_pilot }}" alt="">
+          <span>Pilot Assessment</span>
+        {% endif %}
+      </p>
+      <span style="font-weight:600">{{ title }}</span>
+    </div>
+    <span style="margin-top:0;max-width:700px;font-size:24px;font-weight:600;"> 
+      {{ device['manufacturer'] }}
+      {{ device['model']}}
+    </span> 
+    <img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
+  </div>
+
+<div class="module-page-content">
+  
+    <h4 class="page-heading">TLS Module</h4>
+    <table class="module-summary">
+  
+    
+      <thead>
+        <tr>
+          
+            <th>Expiry</th>
+          
+            <th>Length</th>
+          
+            <th>Type</th>
+          
+            <th>Port number</th>
+          
+            <th>Signed by</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>2049-12-31 23:59:59</td>
+          
+            <td>779</td>
+          
+            <td>EC</td>
+          
+            <td>35288</td>
+          
+            <td>None</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
+  
+
+  <div style="display:flex;justify-content:space-between;">
+      <div style="margin-right:20px;">
+        <h5>Certificate Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
+                <td>Version</td>
+                <td>3 (0x2)</td>
               </tr>
-            </thead>
-            <tbody>
-          
+            
               <tr>
-                <td>2049-12-31 23:59:59</td>
-                <td>779</td>
-                <td>EC</td>
-                <td>47188</td>
-                <td>None</td>
+                <td>Signature Alg.</td>
+                <td>sha256WithRSAEncryption</td>
               </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Validity from</td>
+                <td>2023-03-29 18:37:51</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>3 (0x2)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>sha256WithRSAEncryption</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2023-03-29 18:37:51</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2049-12-31 23:59:59</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Valid to</td>
+                <td>2049-12-31 23:59:59</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>ST</td>
-              <td>Pennsylvania</td>
-            </tr>
-          
-            <tr>
-              <td>L</td>
-              <td>Coopersburg</td>
-            </tr>
-          
-            <tr>
-              <td>O</td>
-              <td>Lutron Electronics Co.\, Inc.</td>
-            </tr>
-          
-            <tr>
-              <td>CN</td>
-              <td>athena04E580B9</td>
-            </tr>
-          
+            
           </tbody>
         </table>
-          </div>
-        </div>
-
-
-            <h5>Certificate Extensions</h5>
-            <table class="module-data" style="margin-bottom:20px;">
-              <thead>
-                <tr>
-                  <th>Property</th>
-                  <th>Value</th>
-                </tr>
-              </thead>
-              <tbody>
-                    <tr>
-                      <td>authorityKeyIdentifier</td> 
-                      <td>key_identifier=accca4f9bd2a47dae81a8f4c87ed2c8edcfd07bf, authority_cert_issuer=None, authority_cert_serial_number=None</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>subjectKeyIdentifier</td> 
-                      <td>digest=37d90a274635e963081520f98411bda240d30252</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>basicConstraints</td> 
-                      <td>ca=False, path_length=None</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>keyUsage</td> 
-                      <td>digital_signature=True, key_cert_sign=False, key_encipherment=False, crl_sign=False</td>
-                    </tr> 
-                  
-            </tbody>
-          </table>
-
-
-          <table class="module-summary" style="width:100%;">
-            <thead>
+      </div>
+      <div>
+        <h5>Subject Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
+                <td>C</td>
+                <td>US</td>
               </tr>
-            </thead>
-            <tbody>
-          
+            
               <tr>
-                <td>2049-12-31 23:59:59</td>
-                <td>779</td>
-                <td>EC</td>
-                <td>35288</td>
-                <td>None</td>
+                <td>ST</td>
+                <td>Pennsylvania</td>
               </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>L</td>
+                <td>Coopersburg</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>3 (0x2)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>sha256WithRSAEncryption</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2023-03-29 18:37:51</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2049-12-31 23:59:59</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>O</td>
+                <td>Lutron Electronics Co.\, Inc.</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>ST</td>
-              <td>Pennsylvania</td>
-            </tr>
-          
-            <tr>
-              <td>L</td>
-              <td>Coopersburg</td>
-            </tr>
-          
-            <tr>
-              <td>O</td>
-              <td>Lutron Electronics Co.\, Inc.</td>
-            </tr>
-          
-            <tr>
-              <td>CN</td>
-              <td>athena04E580B9</td>
-            </tr>
-          
+            
+              <tr>
+                <td>CN</td>
+                <td>athena04E580B9</td>
+              </tr>
+            
           </tbody>
         </table>
           </div>
         </div>
-
-
-            <h5>Certificate Extensions</h5>
+        
+          <h5>Certificate Extensions</h5>
             <table class="module-data" style="margin-bottom:20px;">
               <thead>
                 <tr>
@@ -234,128 +152,185 @@ <h5>Certificate Extensions</h5>
                 </tr>
               </thead>
               <tbody>
-                    <tr>
-                      <td>authorityKeyIdentifier</td> 
-                      <td>key_identifier=accca4f9bd2a47dae81a8f4c87ed2c8edcfd07bf, authority_cert_issuer=None, authority_cert_serial_number=None</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>subjectKeyIdentifier</td> 
-                      <td>digest=37d90a274635e963081520f98411bda240d30252</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>basicConstraints</td> 
-                      <td>ca=False, path_length=None</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>keyUsage</td> 
-                      <td>digital_signature=True, key_cert_sign=False, key_encipherment=False, crl_sign=False</td>
-                    </tr> 
-                  
-            </tbody>
-          </table>
+              
+                 <tr>
+                    <td>authorityKeyIdentifier</td> 
+                    <td>key_identifier=accca4f9bd2a47dae81a8f4c87ed2c8edcfd07bf, authority_cert_issuer=None, authority_cert_serial_number=None</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>subjectKeyIdentifier</td> 
+                    <td>digest=37d90a274635e963081520f98411bda240d30252</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>basicConstraints</td> 
+                    <td>ca=False, path_length=None</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>keyUsage</td> 
+                    <td>digital_signature=True, key_cert_sign=False, key_encipherment=False, crl_sign=False</td>
+                  </tr> 
+              
+              </tbody>
+            </table>
+        
+
+
+</div>
 
+<div class="footer">
+    <div class="footer-label">Testrun {{ version }}</div>
+    <div class="footer-label page-index" style="right: 0px"></div>
+  </div>
+  </div>
+  <div style="break-after:page"></div>
 
+  <div class="page">
+    <div class="header">
+    <div class="header-info">
+      {# Badge #}
+      <p class="header-info-badge">
+        {% if json_data['device']['test_pack'] == 'Device Qualification' %}
+          <img src="data:image/png;base64, {{ icon_qualification }}" alt="">
+          <span>Device Qualification</span>
+        {% else %}
+          <img src="data:image/png;base64, {{ icon_pilot }}" alt="">
+          <span>Pilot Assessment</span>
+        {% endif %}
+      </p>
+      <span style="font-weight:600">{{ title }}</span>
+    </div>
+    <span style="margin-top:0;max-width:700px;font-size:24px;font-weight:600;"> 
+      {{ device['manufacturer'] }}
+      {{ device['model']}}
+    </span> 
+    <img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
+  </div>
+
+<div class="module-page-content">
+  
+    <table class="module-summary not-first">
+  
+    
+      <thead>
+        <tr>
+          
+            <th>Expiry</th>
+          
+            <th>Length</th>
+          
+            <th>Type</th>
+          
+            <th>Port number</th>
+          
+            <th>Signed by</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>2119-02-05 00:00:00</td>
+          
+            <td>619</td>
+          
+            <td>EC</td>
+          
+            <td>443</td>
+          
+            <td>AthenaProcessor685E1CCB6ECB</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
+  
 
-          <table class="module-summary" style="width:100%;">
-            <thead>
+  <div style="display:flex;justify-content:space-between;">
+      <div style="margin-right:20px;">
+        <h5>Certificate Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
+                <td>Version</td>
+                <td>3 (0x2)</td>
               </tr>
-            </thead>
-            <tbody>
-          
+            
               <tr>
-                <td>2119-02-05 00:00:00</td>
-                <td>619</td>
-                <td>EC</td>
-                <td>443</td>
-                <td>AthenaProcessor685E1CCB6ECB</td>
+                <td>Signature Alg.</td>
+                <td>ecdsa-with-SHA256</td>
               </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Validity from</td>
+                <td>2019-03-01 00:00:00</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>3 (0x2)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>ecdsa-with-SHA256</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2019-03-01 00:00:00</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2119-02-05 00:00:00</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Valid to</td>
+                <td>2119-02-05 00:00:00</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>ST</td>
-              <td>Pennsylvania</td>
-            </tr>
-          
-            <tr>
-              <td>L</td>
-              <td>Coopersburg</td>
-            </tr>
-          
-            <tr>
-              <td>O</td>
-              <td>Lutron Electronics Co.\, Inc.</td>
-            </tr>
-          
+            
+          </tbody>
+        </table>
+      </div>
+      <div>
+        <h5>Subject Information</h5>
+        <table class="module-data">
+          <thead>
             <tr>
-              <td>CN</td>
-              <td>IPLServer4E580B9</td>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
             </tr>
-          
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>C</td>
+                <td>US</td>
+              </tr>
+            
+              <tr>
+                <td>ST</td>
+                <td>Pennsylvania</td>
+              </tr>
+            
+              <tr>
+                <td>L</td>
+                <td>Coopersburg</td>
+              </tr>
+            
+              <tr>
+                <td>O</td>
+                <td>Lutron Electronics Co.\, Inc.</td>
+              </tr>
+            
+              <tr>
+                <td>CN</td>
+                <td>IPLServer4E580B9</td>
+              </tr>
+            
           </tbody>
         </table>
           </div>
         </div>
-
-
-            <h5>Certificate Extensions</h5>
+        
+          <h5>Certificate Extensions</h5>
             <table class="module-data" style="margin-bottom:20px;">
               <thead>
                 <tr>
@@ -364,128 +339,185 @@ <h5>Certificate Extensions</h5>
                 </tr>
               </thead>
               <tbody>
-                    <tr>
-                      <td>keyUsage</td> 
-                      <td>digital_signature=True, key_cert_sign=False, key_encipherment=True, crl_sign=False</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>extendedKeyUsage</td> 
-                      <td>serverAuth, Unknown OID</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>authorityKeyIdentifier</td> 
-                      <td>key_identifier=dff100033b0ab36497bbcd2f3e0515ea7b2f7ea0, authority_cert_issuer=None, authority_cert_serial_number=None</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>subjectAltName</td> 
-                      <td>IPLServer4E580B9</td>
-                    </tr> 
-                  
-            </tbody>
-          </table>
+              
+                 <tr>
+                    <td>keyUsage</td> 
+                    <td>digital_signature=True, key_cert_sign=False, key_encipherment=True, crl_sign=False</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>extendedKeyUsage</td> 
+                    <td>serverAuth, Unknown OID</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>authorityKeyIdentifier</td> 
+                    <td>key_identifier=dff100033b0ab36497bbcd2f3e0515ea7b2f7ea0, authority_cert_issuer=None, authority_cert_serial_number=None</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>subjectAltName</td> 
+                    <td>IPLServer4E580B9</td>
+                  </tr> 
+              
+              </tbody>
+            </table>
+        
+
+
+</div>
 
+<div class="footer">
+    <div class="footer-label">Testrun {{ version }}</div>
+    <div class="footer-label page-index" style="right: 0px"></div>
+  </div>
+  </div>
+  <div style="break-after:page"></div>
 
+  <div class="page">
+    <div class="header">
+    <div class="header-info">
+      {# Badge #}
+      <p class="header-info-badge">
+        {% if json_data['device']['test_pack'] == 'Device Qualification' %}
+          <img src="data:image/png;base64, {{ icon_qualification }}" alt="">
+          <span>Device Qualification</span>
+        {% else %}
+          <img src="data:image/png;base64, {{ icon_pilot }}" alt="">
+          <span>Pilot Assessment</span>
+        {% endif %}
+      </p>
+      <span style="font-weight:600">{{ title }}</span>
+    </div>
+    <span style="margin-top:0;max-width:700px;font-size:24px;font-weight:600;"> 
+      {{ device['manufacturer'] }}
+      {{ device['model']}}
+    </span> 
+    <img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
+  </div>
+
+<div class="module-page-content">
+  
+    <table class="module-summary not-first">
+  
+    
+      <thead>
+        <tr>
+          
+            <th>Expiry</th>
+          
+            <th>Length</th>
+          
+            <th>Type</th>
+          
+            <th>Port number</th>
+          
+            <th>Signed by</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>2049-12-31 23:59:59</td>
+          
+            <td>779</td>
+          
+            <td>EC</td>
+          
+            <td>47188</td>
+          
+            <td>None</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
+  
 
-          <table class="module-summary" style="width:100%;">
-            <thead>
+  <div style="display:flex;justify-content:space-between;">
+      <div style="margin-right:20px;">
+        <h5>Certificate Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
+                <td>Version</td>
+                <td>3 (0x2)</td>
               </tr>
-            </thead>
-            <tbody>
-          
+            
               <tr>
-                <td>2049-12-31 23:59:59</td>
-                <td>779</td>
-                <td>EC</td>
-                <td>47188</td>
-                <td>None</td>
+                <td>Signature Alg.</td>
+                <td>sha256WithRSAEncryption</td>
               </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Validity from</td>
+                <td>2023-03-29 18:37:51</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>3 (0x2)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>sha256WithRSAEncryption</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2023-03-29 18:37:51</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2049-12-31 23:59:59</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Valid to</td>
+                <td>2049-12-31 23:59:59</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>ST</td>
-              <td>Pennsylvania</td>
-            </tr>
-          
-            <tr>
-              <td>L</td>
-              <td>Coopersburg</td>
-            </tr>
-          
-            <tr>
-              <td>O</td>
-              <td>Lutron Electronics Co.\, Inc.</td>
-            </tr>
-          
+            
+          </tbody>
+        </table>
+      </div>
+      <div>
+        <h5>Subject Information</h5>
+        <table class="module-data">
+          <thead>
             <tr>
-              <td>CN</td>
-              <td>athena04E580B9</td>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
             </tr>
-          
+          </thead>
+          <tbody>
+            
+              <tr>
+                <td>C</td>
+                <td>US</td>
+              </tr>
+            
+              <tr>
+                <td>ST</td>
+                <td>Pennsylvania</td>
+              </tr>
+            
+              <tr>
+                <td>L</td>
+                <td>Coopersburg</td>
+              </tr>
+            
+              <tr>
+                <td>O</td>
+                <td>Lutron Electronics Co.\, Inc.</td>
+              </tr>
+            
+              <tr>
+                <td>CN</td>
+                <td>athena04E580B9</td>
+              </tr>
+            
           </tbody>
         </table>
           </div>
         </div>
-
-
-            <h5>Certificate Extensions</h5>
+        
+          <h5>Certificate Extensions</h5>
             <table class="module-data" style="margin-bottom:20px;">
               <thead>
                 <tr>
@@ -494,45 +526,125 @@ <h5>Certificate Extensions</h5>
                 </tr>
               </thead>
               <tbody>
-                    <tr>
-                      <td>authorityKeyIdentifier</td> 
-                      <td>key_identifier=accca4f9bd2a47dae81a8f4c87ed2c8edcfd07bf, authority_cert_issuer=None, authority_cert_serial_number=None</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>subjectKeyIdentifier</td> 
-                      <td>digest=37d90a274635e963081520f98411bda240d30252</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>basicConstraints</td> 
-                      <td>ca=False, path_length=None</td>
-                    </tr> 
-                  
-                    <tr>
-                      <td>keyUsage</td> 
-                      <td>digital_signature=True, key_cert_sign=False, key_encipherment=False, crl_sign=False</td>
-                    </tr> 
-                  
-            </tbody>
-          </table>
-    <h1>Outbound Connections</h1>
+              
+                 <tr>
+                    <td>authorityKeyIdentifier</td> 
+                    <td>key_identifier=accca4f9bd2a47dae81a8f4c87ed2c8edcfd07bf, authority_cert_issuer=None, authority_cert_serial_number=None</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>subjectKeyIdentifier</td> 
+                    <td>digest=37d90a274635e963081520f98411bda240d30252</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>basicConstraints</td> 
+                    <td>ca=False, path_length=None</td>
+                  </tr> 
+              
+                 <tr>
+                    <td>keyUsage</td> 
+                    <td>digital_signature=True, key_cert_sign=False, key_encipherment=False, crl_sign=False</td>
+                  </tr> 
+              
+              </tbody>
+            </table>
+        
+
+
+</div>
+
+<div class="footer">
+    <div class="footer-label">Testrun {{ version }}</div>
+    <div class="footer-label page-index" style="right: 0px"></div>
+  </div>
+  </div>
+  <div style="break-after:page"></div>
+
+  <div class="page">
+    <div class="header">
+    <div class="header-info">
+      {# Badge #}
+      <p class="header-info-badge">
+        {% if json_data['device']['test_pack'] == 'Device Qualification' %}
+          <img src="data:image/png;base64, {{ icon_qualification }}" alt="">
+          <span>Device Qualification</span>
+        {% else %}
+          <img src="data:image/png;base64, {{ icon_pilot }}" alt="">
+          <span>Pilot Assessment</span>
+        {% endif %}
+      </p>
+      <span style="font-weight:600">{{ title }}</span>
+    </div>
+    <span style="margin-top:0;max-width:700px;font-size:24px;font-weight:600;"> 
+      {{ device['manufacturer'] }}
+      {{ device['model']}}
+    </span> 
+    <img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
+  </div>
+
+<div class="module-page-content">
+  
+    
+  
+
+  <h1>Outbound Connections</h1>
     <table class="module-data">
       <thead>
           <tr>
-              <th>Destination IP</th>
-              <th>Port</th>
+              
+                <th>Destination IP</th>
+              
+                <th>Port</th>
+              
           </tr>
       </thead>
-    <tbody>
-    	<tr><td>224.0.0.251</td><td>5353</td></tr>
-	<tr><td>209.244.0.3</td><td>Unknown</td></tr>
-	<tr><td>3.227.250.136</td><td>443</td></tr>
-	<tr><td>3.227.203.88</td><td>443</td></tr>
-	<tr><td>34.226.101.252</td><td>8883</td></tr>
-	<tr><td>3.227.250.208</td><td>443</td></tr>
-	<tr><td>52.94.225.110</td><td>443</td></tr>
-    </tbody>
-    
-</table>
-    
\ No newline at end of file
+      <tbody>
+      
+        <tr>
+          <td>224.0.0.251</td>
+          <td>5353</td>
+        </tr>
+      
+        <tr>
+          <td>209.244.0.3</td>
+          <td>Unknown</td>
+        </tr>
+      
+        <tr>
+          <td>3.227.250.136</td>
+          <td>443</td>
+        </tr>
+      
+        <tr>
+          <td>3.227.203.88</td>
+          <td>443</td>
+        </tr>
+      
+        <tr>
+          <td>34.226.101.252</td>
+          <td>8883</td>
+        </tr>
+      
+        <tr>
+          <td>3.227.250.208</td>
+          <td>443</td>
+        </tr>
+      
+        <tr>
+          <td>52.94.225.110</td>
+          <td>443</td>
+        </tr>
+      
+      </tbody>
+    </table>
+
+
+</div>
+
+<div class="footer">
+    <div class="footer-label">Testrun {{ version }}</div>
+    <div class="footer-label page-index" style="right: 0px"></div>
+  </div>
+  </div>
+  <div style="break-after:page"></div>
diff --git a/testing/unit/tls/reports/tls_report_no_cert_local.html b/testing/unit/tls/reports/tls_report_no_cert_local.html
index c025ee9e8..2ab01ec15 100644
--- a/testing/unit/tls/reports/tls_report_no_cert_local.html
+++ b/testing/unit/tls/reports/tls_report_no_cert_local.html
@@ -1,5 +1,45 @@
-<h4 class="page-heading">TLS Module</h4>
-        <div class="callout-container info">
-          <div class="icon"></div>
-          No TLS certificates found on the device
-        </div>
\ No newline at end of file
+
+  <div class="page">
+    <div class="header">
+    <div class="header-info">
+      {# Badge #}
+      <p class="header-info-badge">
+        {% if json_data['device']['test_pack'] == 'Device Qualification' %}
+          <img src="data:image/png;base64, {{ icon_qualification }}" alt="">
+          <span>Device Qualification</span>
+        {% else %}
+          <img src="data:image/png;base64, {{ icon_pilot }}" alt="">
+          <span>Pilot Assessment</span>
+        {% endif %}
+      </p>
+      <span style="font-weight:600">{{ title }}</span>
+    </div>
+    <span style="margin-top:0;max-width:700px;font-size:24px;font-weight:600;"> 
+      {{ device['manufacturer'] }}
+      {{ device['model']}}
+    </span> 
+    <img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
+  </div>
+
+<div class="module-page-content">
+  
+    <h4 class="page-heading">TLS Module</h4>
+    <table class="module-summary">
+  
+    
+  
+
+  <div class="callout-container info">
+    <div class="icon"></div>
+    No TLS certificates found on the device
+  </div> 
+
+
+</div>
+
+<div class="footer">
+    <div class="footer-label">Testrun {{ version }}</div>
+    <div class="footer-label page-index" style="right: 0px"></div>
+  </div>
+  </div>
+  <div style="break-after:page"></div>
diff --git a/testing/unit/tls/reports/tls_report_single.html b/testing/unit/tls/reports/tls_report_single.html
index 0f6a5a4d6..e1c9f9584 100644
--- a/testing/unit/tls/reports/tls_report_single.html
+++ b/testing/unit/tls/reports/tls_report_single.html
@@ -1,220 +1,160 @@
-<h4 class="page-heading">TLS Module</h4>
 
-          <table class="module-summary" style="width:100%;">
-            <thead>
+  <div class="page">
+    <div class="header">
+    <div class="header-info">
+      {# Badge #}
+      <p class="header-info-badge">
+        {% if json_data['device']['test_pack'] == 'Device Qualification' %}
+          <img src="data:image/png;base64, {{ icon_qualification }}" alt="">
+          <span>Device Qualification</span>
+        {% else %}
+          <img src="data:image/png;base64, {{ icon_pilot }}" alt="">
+          <span>Pilot Assessment</span>
+        {% endif %}
+      </p>
+      <span style="font-weight:600">{{ title }}</span>
+    </div>
+    <span style="margin-top:0;max-width:700px;font-size:24px;font-weight:600;"> 
+      {{ device['manufacturer'] }}
+      {{ device['model']}}
+    </span> 
+    <img src="data:image/png;base64, {{ logo }}" alt="Testrun" width="90" style="position: absolute;top: 40%; right: 0px;"></img>
+  </div>
+
+<div class="module-page-content">
+  
+    <h4 class="page-heading">TLS Module</h4>
+    <table class="module-summary">
+  
+    
+      <thead>
+        <tr>
+          
+            <th>Expiry</th>
+          
+            <th>Length</th>
+          
+            <th>Type</th>
+          
+            <th>Port number</th>
+          
+            <th>Signed by</th>
+          
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          
+            <td>2027-09-21 19:57:57</td>
+          
+            <td>901</td>
+          
+            <td>RSA</td>
+          
+            <td>443</td>
+          
+            <td>BuildingsIoT RSA Signing CA</td>
+          
+        </tr>
+      </tbody>
+      </table>
+    
+  
+
+  <div style="display:flex;justify-content:space-between;">
+      <div style="margin-right:20px;">
+        <h5>Certificate Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
+                <td>Version</td>
+                <td>1 (0x0)</td>
               </tr>
-            </thead>
-            <tbody>
-          
+            
               <tr>
-                <td>2027-09-21 19:57:57</td>
-                <td>901</td>
-                <td>RSA</td>
-                <td>443</td>
-                <td>BuildingsIoT RSA Signing CA</td>
+                <td>Signature Alg.</td>
+                <td>sha256WithRSAEncryption</td>
               </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Validity from</td>
+                <td>2022-09-21 19:57:57</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>1 (0x0)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>sha256WithRSAEncryption</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2022-09-21 19:57:57</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2027-09-21 19:57:57</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>Valid to</td>
+                <td>2027-09-21 19:57:57</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>ST</td>
-              <td>California</td>
-            </tr>
-          
-            <tr>
-              <td>L</td>
-              <td>Concord</td>
-            </tr>
-          
-            <tr>
-              <td>O</td>
-              <td>BuildingsIoT</td>
-            </tr>
-          
-            <tr>
-              <td>OU</td>
-              <td>Software</td>
-            </tr>
-          
-            <tr>
-              <td>CN</td>
-              <td>EasyIO_FS-32</td>
-            </tr>
-          
+            
           </tbody>
         </table>
-          </div>
-        </div>
-
-
-
-
-          <table class="module-summary" style="width:100%;">
-            <thead>
+      </div>
+      <div>
+        <h5>Subject Information</h5>
+        <table class="module-data">
+          <thead>
+            <tr>
+              
+              <th>Property</th>
+              
+              <th>Value</th>
+              
+            </tr>
+          </thead>
+          <tbody>
+            
               <tr>
-                <th>Expiry</th>
-                <th>Length</th>
-                <th>Type</th>
-                <th>Port number</th>
-                <th>Signed by</th>
+                <td>C</td>
+                <td>US</td>
               </tr>
-            </thead>
-            <tbody>
-          
+            
               <tr>
-                <td>2027-09-21 19:57:57</td>
-                <td>901</td>
-                <td>RSA</td>
-                <td>443</td>
-                <td>BuildingsIoT RSA Signing CA</td>
+                <td>ST</td>
+                <td>California</td>
               </tr>
-            </tbody>
-          </table>
-        
-        <div id="paired" style="display:flex;justify-content:space-between;">
-          <div style="margin-right:20px;">
-            <h5>Certificate Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>L</td>
+                <td>Concord</td>
               </tr>
-            </thead>
-            <tbody>
-          <tr>
-            <td>Version</td>
-            <td>1 (0x0)</td>
-          </tr>
-          <tr>
-            <td>Signature Alg.</td>
-            <td>sha256WithRSAEncryption</td>
-          </tr>
-          <tr>
-            <td>Validity from</td>
-            <td>2022-09-21 19:57:57</td>
-          </tr>
-          <tr>
-            <td>Valid to</td>
-            <td>2027-09-21 19:57:57</td>
-          </tr>
-        </tbody>
-      </table>
-        
-          </div>
-          <div>
-            <h5>Subject Information</h5>
             
-          <table class="module-data">
-            <thead>
               <tr>
-                <th>Property</th>
-                <th>Value</th>
+                <td>O</td>
+                <td>BuildingsIoT</td>
               </tr>
-            </thead>
-            <tbody>
-            <tr>
-              <td>C</td>
-              <td>US</td>
-            </tr>
-          
-            <tr>
-              <td>ST</td>
-              <td>California</td>
-            </tr>
-          
-            <tr>
-              <td>L</td>
-              <td>Concord</td>
-            </tr>
-          
-            <tr>
-              <td>O</td>
-              <td>BuildingsIoT</td>
-            </tr>
-          
-            <tr>
-              <td>OU</td>
-              <td>Software</td>
-            </tr>
-          
-            <tr>
-              <td>CN</td>
-              <td>EasyIO_FS-32</td>
-            </tr>
-          
+            
+              <tr>
+                <td>OU</td>
+                <td>Software</td>
+              </tr>
+            
+              <tr>
+                <td>CN</td>
+                <td>EasyIO_FS-32</td>
+              </tr>
+            
           </tbody>
         </table>
           </div>
         </div>
+        
 
 
-    <h1>Outbound Connections</h1>
-    <table class="module-data">
-      <thead>
-          <tr>
-              <th>Destination IP</th>
-              <th>Port</th>
-          </tr>
-      </thead>
-    <tbody>
-    
-    </tbody>
-    
-</table>
-    
\ No newline at end of file
+</div>
+
+<div class="footer">
+    <div class="footer-label">Testrun {{ version }}</div>
+    <div class="footer-label page-index" style="right: 0px"></div>
+  </div>
+  </div>
+  <div style="break-after:page"></div>