diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089a095..1ae6d0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.2.12 - 2025-4-29
+- Fixed html parser errors. ([#158](https://github.com/opendevstack/ods-document-generation-templates/pull/158))
 - Remove Jira issue ID strikethrough on SLC documents. ([#153](https://github.com/opendevstack/ods-document-generation-templates/pull/153))
 - Make content in column Test Case No. wrappable. ([#152](https://github.com/opendevstack/ods-document-generation-templates/pull/152))
 - TIR changes: Wording changes to be more inclusive of helm deployments, removed dynamic values from report tables and change in table formatting ([#146](https://github.com/opendevstack/ods-document-generation-templates/pull/146)) & ([#154](https://github.com/opendevstack/ods-document-generation-templates/pull/154))
diff --git a/css/styles.css b/css/styles.css
index 84a0897..e783b7c 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -47,6 +47,9 @@ h5 span {
   margin-right: 1.5em;
 }
 
+del {
+  text-decoration: none;
+}
 
 input + label {
   margin-left: 0.5em;
@@ -168,6 +171,27 @@ td.content-wrappable table th, td.content-wrappable table td {
   white-space: normal;
 }
 
+/* Remove all spacing around .inner-ul-2 elements */
+
+td > ul.inner-ul {
+  list-style-type: none;
+  padding: 0em;
+  margin: 0em;
+}
+
+li > ul.inner-ul {
+  list-style-type: none;
+  padding-left: 1em;
+  padding-right: 0em;
+  padding-top: 0em;
+  padding-bottom: 0em;
+}
+
+.inner-span {
+  display: inline-block;
+  margin-right: 0em;
+}
+
 .center {
   text-align: center;
 }
diff --git a/scripts/scripts.js b/scripts/scripts.js
index 386c5fc..a9a37ab 100644
--- a/scripts/scripts.js
+++ b/scripts/scripts.js
@@ -1,21 +1,39 @@
 function subst() {
-  var vars = {};
+    var vars = {};
 
-  var query_strings_from_url = document.location.search.substring(1).split('&');
-  for (var query_string in query_strings_from_url) {
-    if (query_strings_from_url.hasOwnProperty(query_string)) {
-      var temp_var = query_strings_from_url[query_string].split('=', 2);
-      vars[temp_var[0]] = decodeURI(temp_var[1]);
+    var query_strings_from_url = document.location.search
+        .substring(1)
+        .split("&");
+    for (var query_string in query_strings_from_url) {
+        if (query_strings_from_url.hasOwnProperty(query_string)) {
+            var temp_var = query_strings_from_url[query_string].split("=", 2);
+            vars[temp_var[0]] = decodeURI(temp_var[1]);
+        }
     }
-  }
 
-  var css_selector_classes = ['page', 'frompage', 'topage', 'webpage', 'section', 'subsection', 'date', 'isodate', 'time', 'title', 'doctitle', 'sitepage', 'sitepages'];
-  for (var css_class in css_selector_classes) {
-    if (css_selector_classes.hasOwnProperty(css_class)) {
-      var element = document.getElementsByClassName(css_selector_classes[css_class]);
-      for (var j = 0; j < element.length; ++j) {
-        element[j].textContent = vars[css_selector_classes[css_class]];
-      }
+    var css_selector_classes = [
+        "page",
+        "frompage",
+        "topage",
+        "webpage",
+        "section",
+        "subsection",
+        "date",
+        "isodate",
+        "time",
+        "title",
+        "doctitle",
+        "sitepage",
+        "sitepages",
+    ];
+    for (var css_class in css_selector_classes) {
+        if (css_selector_classes.hasOwnProperty(css_class)) {
+            var element = document.getElementsByClassName(
+                css_selector_classes[css_class]
+            );
+            for (var j = 0; j < element.length; ++j) {
+                element[j].textContent = vars[css_selector_classes[css_class]];
+            }
+        }
     }
-  }
 }
diff --git a/templates/CSD-3.html.tmpl b/templates/CSD-3.html.tmpl
index fcb7fd0..8a600b6 100644
--- a/templates/CSD-3.html.tmpl
+++ b/templates/CSD-3.html.tmpl
@@ -742,6 +742,7 @@
                                 <td class="lean">URS</td>
                                 <td class="content-wrappable">Summary: {{{ursName}}}{{#if ursDescription}}<br>{{{ursDescription}}}{{/if}}</td>
                                 <td class="lean">{{applicability}}</td>
+							</tr>
                             <tr>
                                 <td class="lean">FS</td>
                                 <td class="content-wrappable">Summary: {{{fsName}}}{{#if fsDescription}}<br>{{{fsDescription}}}{{/if}}</td>
diff --git a/templates/CSD-5.html.tmpl b/templates/CSD-5.html.tmpl
index ee2c7dc..2a4a4b2 100644
--- a/templates/CSD-5.html.tmpl
+++ b/templates/CSD-5.html.tmpl
@@ -268,6 +268,7 @@
                                 <td class="lean">{{applicability}}</td>
                             </tr>
                             {{/each}}
+						</tbody>
                     </table>
                 {{/each}}
              {{else}}
diff --git a/templates/DIL.html.tmpl b/templates/DIL.html.tmpl
index 6caab57..b98d1c9 100644
--- a/templates/DIL.html.tmpl
+++ b/templates/DIL.html.tmpl
@@ -68,7 +68,7 @@
         <h1>Functional / Requirements Testing Discrepancy Log</h1>
 
         <p>This Discrepancy Log is to be used for documentation of any discrepancies (e.g. failed test cases, test case errors, testing execution errors) found during testing. These should include all test cases where the result has been set to failed.</p>
-        <p><em>Clarification: Discrepancies detected during a test run will be documented in the Discrepancy Log (DIL) version associated with the test run. The DIL will be created during each test run. Any updated version of the DIL showing no discrepancies serves as evidence for the successful correction of the error(s) causing the discrepancies.</br>
+        <p><em>Clarification: Discrepancies detected during a test run will be documented in the Discrepancy Log (DIL) version associated with the test run. The DIL will be created during each test run. Any updated version of the DIL showing no discrepancies serves as evidence for the successful correction of the error(s) causing the discrepancies.<br/>
         Furthermore, this discrepancy log only covers discrepancies from tasks automated through OpenDevStack. Any manual tasks done outside of OpenDevStack, which created discrepancies, must be covered in a secondary DIL.</em></p>
 
         <h2>Integration Testing Discrepancy Log</h2>
@@ -82,7 +82,7 @@
 					<table>
 						<thead>
 							<th style="white-space: nowrap">Discrepancy ID</th>
-							<th style="white-space: nowrap">Test Case No.</th>
+							<th class="content-wrappable">Test Case No.</th>
 							<th class="content-wrappable">Level of Test Case</th>
 							<th class="content-wrappable">Description of Failure or Discrepancy</th>
 							<th class="content-wrappable">Remediation Action</th>
@@ -94,7 +94,7 @@
 							{{#each data.integrationTests}}
 								<tr>
 									<td style="white-space: nowrap">{{discrepancyID}}</td>
-									<td style="white-space: nowrap">{{testcaseID}}</td>
+									<td class="content-wrappable">{{testcaseID}}</td>
 									<td class="content-wrappable">Integration</td>
 									<td class="hyphenate">{{{description}}}</td>
 									<td class="content-wrappable">{{{remediation}}}</td>
@@ -122,7 +122,7 @@
 					<table>
 							<thead>
 							    <th style="white-space: nowrap">Discrepancy ID</th>
-							    <th style="white-space: nowrap">Test Case No.</th>
+							    <th class="content-wrappable">Test Case No.</th>
 								<th class="content-wrappable">Level of Test Case</th>
 								<th class="content-wrappable">Description of Failure or Discrepancy</th>
 								<th class="content-wrappable">Remediation Action</th>
@@ -134,7 +134,7 @@
 								{{#each data.acceptanceTests}}
 									<tr>
 										<td style="white-space: nowrap">{{discrepancyID}}</td>
-										<td style="white-space: nowrap">{{testcaseID}}</td>
+										<td class="content-wrappable">{{testcaseID}}</td>
 										<td class="content-wrappable">Acceptance</td>
 										<td class="hyphenate">{{{description}}}</td>
 										<td class="content-wrappable">{{{remediation}}}</td>
diff --git a/templates/IVP.html.tmpl b/templates/IVP.html.tmpl
index 0a6e66d..7f825c1 100644
--- a/templates/IVP.html.tmpl
+++ b/templates/IVP.html.tmpl
@@ -312,10 +312,10 @@ Other test cases:
                 <td class="content-wrappable">
                 {{#if steps}}
                     <ol>
-                {{#each steps}}
+					{{#each steps}}
                         <li>{{step}}</li>
-                {{/each}}
-  <p>N/A</p>/ol>
+					{{/each}}
+					</ol>
                 {{else}}
                 No test steps defined
                 {{/if}}
diff --git a/templates/RA.html.tmpl b/templates/RA.html.tmpl
index 2a816c5..11a0cb8 100644
--- a/templates/RA.html.tmpl
+++ b/templates/RA.html.tmpl
@@ -451,7 +451,7 @@
 				<tr>
 					<td class="lean">{{key}}</td>
 					<td class="lean">{{type}}</td>
-					<td class="content-wrappable">{{{name}}}</br>{{{description}}}</td>
+					<td class="content-wrappable">{{{name}}}<br/>{{{description}}}</td>
 					<td class="lean">{{referencesRisk}}</td>
 				</tr>
 				{{/each}}
diff --git a/templates/SSDS-1.html.tmpl b/templates/SSDS-1.html.tmpl
index 726128e..a5ae941 100644
--- a/templates/SSDS-1.html.tmpl
+++ b/templates/SSDS-1.html.tmpl
@@ -147,7 +147,7 @@
             {{/if}}
 			{{#if data.sections.sec16s1.bitbucket}}
 				<p>
-					A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.</br>
+					A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.<br/>
 					<br/>
 					A person who creates a PR gets attributed as its author and nominates at least one reviewer. Once mandatory changes requested by the reviewers have been incorporated by the contributors, reviewers can approve the PR. An approval permits that the approved contribution can be merged from a temporary source branch into a longer living target branch inside the repository.{{#if metadata.gxp}} A single person must not assume the roles of contributor and reviewer on the same PR (no self-approvals).{{/if}}<br/>
 					<br/>
diff --git a/templates/SSDS-3.html.tmpl b/templates/SSDS-3.html.tmpl
index 2e6e3ec..df85cf1 100644
--- a/templates/SSDS-3.html.tmpl
+++ b/templates/SSDS-3.html.tmpl
@@ -147,7 +147,7 @@
             {{/if}}
             {{#if data.sections.sec16s1.bitbucket}}
                 <p>
-                    A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.</br>
+                    A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.<br/>
                     <br/>
                     A person who creates a PR gets attributed as its author and nominates at least one reviewer. Once mandatory changes requested by the reviewers have been incorporated by the contributors, reviewers can approve the PR. An approval permits that the approved contribution can be merged from a temporary source branch into a longer living target branch inside the repository.{{#if metadata.gxp}} A single person must not assume the roles of contributor and reviewer on the same PR (no self-approvals).{{/if}}<br/>
                     <br/>
diff --git a/templates/SSDS-4.html.tmpl b/templates/SSDS-4.html.tmpl
index 6ff7d99..a11fb84 100644
--- a/templates/SSDS-4.html.tmpl
+++ b/templates/SSDS-4.html.tmpl
@@ -146,7 +146,7 @@
             {{/if}}
             {{#if data.sections.sec16s1.bitbucket}}
                 <p>
-                    A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.</br>
+                    A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.<br/>
                     <br/>
                     A person who creates a PR gets attributed as its author and nominates at least one reviewer. Once mandatory changes requested by the reviewers have been incorporated by the contributors, reviewers can approve the PR. An approval permits that the approved contribution can be merged from a temporary source branch into a longer living target branch inside the repository.{{#if metadata.gxp}} A single person must not assume the roles of contributor and reviewer on the same PR (no self-approvals).{{/if}}<br/>
                     <br/>
diff --git a/templates/SSDS-5.html.tmpl b/templates/SSDS-5.html.tmpl
index 756ce2b..2efd122 100644
--- a/templates/SSDS-5.html.tmpl
+++ b/templates/SSDS-5.html.tmpl
@@ -152,7 +152,7 @@
                 </table>
             {{/if}}
             <p>
-                A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.</br>
+                A Bitbucket Pull Request (PR) is where contributors and reviewers meet to discuss and assert the readiness of a contribution to a Bitbucket repository comprising code, tests, configuration, or a combination of these.<br/>
                 <br/>
                 A person who creates a PR gets attributed as its author and nominates at least one reviewer. Once mandatory changes requested by the reviewers have been incorporated by the contributors, reviewers can approve the PR. An approval permits that the approved contribution can be merged from a temporary source branch into a longer living target branch inside the repository.{{#if metadata.gxp}} A single person must not assume the roles of contributor and reviewer on the same PR (no self-approvals).{{/if}}<br/>
                 <br/>
diff --git a/templates/TIR-infra.html.tmpl b/templates/TIR-infra.html.tmpl
index dba66c2..9dd190c 100644
--- a/templates/TIR-infra.html.tmpl
+++ b/templates/TIR-infra.html.tmpl
@@ -290,7 +290,7 @@
     <div class="page">
         <h2 id="section_6"><span>6</span>Reference Documents</h2>
         <ul>
-            <li>Technical Installation Plan ({{metadata.referencedDocs.TIP}})</li></li>
+            <li>Technical Installation Plan ({{metadata.referencedDocs.TIP}})</li>
         </ul>
         {{#if data.sections.sec6.show}}
             <table class="no-border">
diff --git a/templates/TIR.html.tmpl b/templates/TIR.html.tmpl
index 36a2756..50e39c0 100644
--- a/templates/TIR.html.tmpl
+++ b/templates/TIR.html.tmpl
@@ -1,384 +1,647 @@
 <!DOCTYPE html>
 <html>
+    <head>
+        <title>Technical Installation Report for '{{ metadata.name }}'</title>
+        <link href="../css/styles.css" rel="stylesheet" type="text/css" />
+    </head>
+    <body>
+        <div class="page">
+            <table id="heading">
+                <tr>
+                    <td>
+                        <table>
+                            <tr>
+                                <th colspan="2">Information</th>
+                            </tr>
+                            <tr>
+                                <td class="lean" style="vertical-align: top">
+                                    Name:
+                                </td>
+                                <td class="content-wrappable">
+                                    {{ metadata.name }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean" style="vertical-align: top">
+                                    Description:
+                                </td>
+                                <td class="content-wrappable">
+                                    {{ metadata.description }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean" style="vertical-align: top">
+                                    Version:
+                                </td>
+                                <td class="content-wrappable">
+                                    {{ metadata.version }}/{{ data.documentHistoryLatestVersionId }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">Date Created:</td>
+                                <td class="content-wrappable">
+                                    {{ metadata.date_created }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">Git Commit:</td>
+                                <td class="content-wrappable">
+                                    {{ metadata.git.commit }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">Git Tag:</td>
+                                <td class="content-wrappable">
+                                    {{ metadata.git.targetTag }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">Git URL:</td>
+                                <td class="content-wrappable">
+                                    {{ metadata.git.url }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">OpenShift Cluster API URL:</td>
+                                <td class="content-wrappable">
+                                    {{ metadata.openShift.apiUrl }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">
+                                    Created by Jenkins Job Name:
+                                </td>
+                                <td class="content-wrappable">
+                                    {{ metadata.jenkins.jobName }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">
+                                    Created by Jenkins Build Number:
+                                </td>
+                                <td class="content-wrappable">
+                                    {{ metadata.jenkins.buildNumber }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="lean">Target environment:</td>
+                                <td class="content-wrappable">
+                                    {{ metadata.buildParameter.targetEnvironment }}
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                    <td id="logo" class="lean"></td>
+                </tr>
+            </table>
 
-<head>
-    <title>Technical Installation Report for '{{metadata.name}}'</title>
-    <link href="../css/styles.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body>
-    <div class="page">
-        <table id="heading">
-            <tr>
-                <td>
-                    <table>
-                        <tr>
-                            <th colspan="2">
-                                Information
-                            </th>
-                        </tr>
-                        <tr>
-                            <td class="lean" style="vertical-align: top;">Name:</td>
-                            <td class="content-wrappable">{{metadata.name}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean" style="vertical-align: top;">Description:</td>
-                            <td class="content-wrappable">{{metadata.description}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean" style="vertical-align: top;">Version:</td>
-                            <td class="content-wrappable">{{metadata.version}}/{{data.documentHistoryLatestVersionId}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">Date Created:</td>
-                            <td class="content-wrappable">{{metadata.date_created}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">Git Commit:</td>
-                            <td class="content-wrappable">{{metadata.git.commit}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">Git Tag:</td>
-                            <td class="content-wrappable">{{metadata.git.targetTag}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">Git URL:</td>
-                            <td class="content-wrappable">{{metadata.git.url}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">OpenShift Cluster API URL:</td>
-                            <td class="content-wrappable">{{metadata.openShift.apiUrl}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">Created by Jenkins Job Name:</td>
-                            <td class="content-wrappable">{{metadata.jenkins.jobName}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">Created by Jenkins Build Number:</td>
-                            <td class="content-wrappable">{{metadata.jenkins.buildNumber}}</td>
-                        </tr>
-                        <tr>
-                            <td class="lean">Target environment:</td>
-                            <td class="content-wrappable">{{metadata.buildParameter.targetEnvironment}}</td>
-                        </tr>
-                    </table>
-                </td>
-                <td id="logo" class="lean"></td>
-            </tr>
-        </table>
-
-        <div id="blueband">&nbsp;</div>
-
-        <h1>Technical Installation Report for '{{metadata.name}}'</h1>
-
-        <h2>Table of Contents</h2>
-        <ol class="table-of-contents">
-            <li><a href="#section_1">Introduction</a></li>
-            <li><a href="#section_2">Installation</a></li>
-            <li><a href="#section_3">Diagnostics and Testing</a></li>
-            <li><a href="#section_4">Conclusion Statement</a></li>
-            <li><a href="#section_5">Definitions and Abbreviations</a>
-                <ol>
-                    <li><a href="#section_5_1">Definitions</a></li>
-                    <li><a href="#section_5_2">Abbreviations</a></li>
-                </ol>
-            </li>
-            <li><a href="#section_6">Reference Documents</a></li>
-            <li><a href="#section_7">Document History</a></li>
-        </ol>
-    </div>
-
-    <div class="page">
-        <h2 id="section_1"><span>1</span>Introduction</h2>
-
-        <p>This document describes the installation of the software-defined component <em>{{data.repo.id}}</em>. The installation is based on the corresponding Technical Installation Plan (<em>TIP</em>) of Config Item: {{metadata.buildParameter.configItem}}.</p>
+            <div id="blueband">&nbsp;</div>
 
-        <p>The plan outlines additional chapters, namely <em>Installation Prerequisites (3)</em> and <em>Environmental Conditions (4)</em>.</p>
+            <h1>Technical Installation Report for '{{ metadata.name }}'</h1>
 
-        <p>Installation plan reference: ITEMS Document Number <em>{{metadata.version}}-{{metadata.jenkins.buildNumber}}</em>, Version: <em>{{metadata.referencedDocs.TIP}}</em>.</p>
+            <h2>Table of Contents</h2>
+            <ol class="table-of-contents">
+                <li><a href="#section_1">Introduction</a></li>
+                <li><a href="#section_2">Installation</a></li>
+                <li><a href="#section_3">Diagnostics and Testing</a></li>
+                <li><a href="#section_4">Conclusion Statement</a></li>
+                <li>
+                    <a href="#section_5">Definitions and Abbreviations</a>
+                    <ol>
+                        <li><a href="#section_5_1">Definitions</a></li>
+                        <li><a href="#section_5_2">Abbreviations</a></li>
+                    </ol>
+                </li>
+                <li><a href="#section_6">Reference Documents</a></li>
+                <li><a href="#section_7">Document History</a></li>
+            </ol>
+        </div>
 
-        <h3>Parameters</h3>
-        <table class="no-page-break">
-            <tr>
-                <th class="center lean" colspan="2">Parameters</th>
-            </tr>
-            <tr>
-                <th class="lean">Parameter</th>
-                <th class="content-wrappable">Value</th>
-            </tr>
-            <tr>
-                <td>Git Commit Component <em>{{id}}</em></td>
-                <td class="content-wrappable">{{data.repo.data.git.commit}}</td>
-            </tr>
-            <tr>
-                <td>Git Repo Component <em>{{id}}</em></td>
-                <td class="content-wrappable">{{data.repo.data.git.url}}</td>
-            </tr>
-            <tr>
-                <td>ODS Component Type <em>{{id}}</em></td>
-                <td class="content-wrappable">{{data.repo.type}}</td>
-            </tr>
-            <tr>
-                <td>Environment</td>
-                <td class="content-wrappable">{{metadata.buildParameter.targetEnvironment}}</td>
-            </tr>
-            <tr>
-                <td>Change Description</td>
-                <td class="content-wrappable">{{metadata.buildParameter.changeDescription}}</td>
-            </tr>
-            <tr>
-                <td>Version</td>
-                <td class="content-wrappable">{{metadata.buildParameter.version}}</td>
-            </tr>
-            <tr>
-                <td>Config Item</td>
-                <td class="content-wrappable">{{metadata.buildParameter.configItem}}</td>
-            </tr>
-        </table>
-    </div>
+        <div class="page">
+            <h2 id="section_1"><span>1</span>Introduction</h2>
 
-    <div class="page">
-        <h2 id="section_2"><span>2</span>Installation</h2>
-        <p>Installations steps have been successfully conducted. Overall installation status:</p>
+            <p>
+                This document describes the installation of the software-defined
+                component <em>{{ data.repo.id }}</em
+                >. The installation is based on the corresponding Technical
+                Installation Plan (<em>TIP</em>) of Config Item:
+                {{ metadata.buildParameter.configItem }}.
+            </p>
 
-        <table>
-            <tr>
-                <td>Status</td>
-                <td>OK</td>
-            </tr>
-        </table>
+            <p>
+                The plan outlines additional chapters, namely
+                <em>Installation Prerequisites (3)</em> and
+                <em>Environmental Conditions (4)</em>.
+            </p>
 
-        <h3 id="section_2_1"><span>2.1</span>Jenkins</h3>
-        <p>Jenkins Job has been successfully executed:</p>
+            <p>
+                Installation plan reference: ITEMS Document Number
+                <em
+                    >{{ metadata.version }}-{{ metadata.jenkins.buildNumber }}</em
+                >, Version: <em>{{ metadata.referencedDocs.TIP }}</em
+                >.
+            </p>
 
-        <table>
-            <thead>
-                <th class="lean">Name</th>
-                <th class="lean">Value</th>
-            </thead>
-            <tbody>
+            <h3>Parameters</h3>
+            <table class="no-page-break">
+                <tr>
+                    <th class="center lean" colspan="2">Parameters</th>
+                </tr>
+                <tr>
+                    <th class="lean">Parameter</th>
+                    <th class="content-wrappable">Value</th>
+                </tr>
+                <tr>
+                    <td>
+                        Git Commit Component <em>{{ id }}</em>
+                    </td>
+                    <td class="content-wrappable">
+                        {{ data.repo.data.git.commit }}
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        Git Repo Component <em>{{ id }}</em>
+                    </td>
+                    <td class="content-wrappable">
+                        {{ data.repo.data.git.url }}
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        ODS Component Type <em>{{ id }}</em>
+                    </td>
+                    <td class="content-wrappable">{{ data.repo.type }}</td>
+                </tr>
+                <tr>
+                    <td>Environment</td>
+                    <td class="content-wrappable">
+                        {{ metadata.buildParameter.targetEnvironment }}
+                    </td>
+                </tr>
+                <tr>
+                    <td>Change Description</td>
+                    <td class="content-wrappable">
+                        {{ metadata.buildParameter.changeDescription }}
+                    </td>
+                </tr>
                 <tr>
-                    <td class="lean">Job Number</td>
-                    <td class="content-wrappable">{{metadata.jenkins.buildNumber}}</td>
+                    <td>Version</td>
+                    <td class="content-wrappable">
+                        {{ metadata.buildParameter.version }}
+                    </td>
                 </tr>
                 <tr>
-                    <td class="lean">Job Name</td>
-                    <td class="content-wrappable">{{metadata.jenkins.jobName}}</td>
+                    <td>Config Item</td>
+                    <td class="content-wrappable">
+                        {{ metadata.buildParameter.configItem }}
+                    </td>
                 </tr>
+            </table>
+        </div>
+
+        <div class="page">
+            <h2 id="section_2"><span>2</span>Installation</h2>
+            <p>
+                Installations steps have been successfully conducted. Overall
+                installation status:
+            </p>
+
+            <table>
                 <tr>
-                    <td class="lean">Build URL</td>
-                    <td class="content-wrappable">{{metadata.jenkins.buildUrl}}</td>
+                    <td>Status</td>
+                    <td>OK</td>
                 </tr>
-            </tbody>
-        </table>
+            </table>
 
-        <h3 id="section_2_2"><span>2.2</span>Components</h3>
-        <p><b>Note:</b> {{deployNote}}</p>
+            <h3 id="section_2_1"><span>2.1</span>Jenkins</h3>
+            <p>Jenkins Job has been successfully executed:</p>
 
-        {{#data.repo}}
-        <p>The following components have been successfully installed:<b>{{id}}</b></p>
-        {{#openShiftData}}
-        <table>
-          {{#builds}}
-            <tr>
-              <table>
-              {{#each .}}
+            <table>
+                <tbody>
+                    <tr>
+                        <td class="lean header">Job Number</td>
+                        <td class="content-wrappable">
+                            {{ metadata.jenkins.buildNumber }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="lean header">Job Name</td>
+                        <td class="content-wrappable">
+                            {{ metadata.jenkins.jobName }}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="lean header">Build URL</td>
+                        <td class="content-wrappable">
+                            {{ metadata.jenkins.buildUrl }}
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+
+            <h3 id="section_2_2"><span>2.2</span>Component</h3>
+            <p><b>Note:</b> {{ deployNote }}</p>
+
+            {{#data.repo}}
+            <p>
+                The following component has been successfully installed:
+                <b>{{ id }}</b>
+            </p>
+            {{/data.repo}}
+            <table>
+                {{#openShiftData}}
+                {{#builds}}
                 <tr>
-                  Build Resource: <b>{{@key}}</b>
-                  <table>
-                    <thead>
-                        <th>Name</th>
-                        <th class="content-wrappable">Value</th>
-                    </thead>
-                    <tbody>
+                    <table>
                         {{#each .}}
-                          <tr>
-                            <td>{{@key}}</td><td class="content-wrappable">{{.}}</td>
-                          <tr>
+                        <tr>
+                            Build Resource:
+                            <b>{{@key}}</b>
+                            <table>
+                                <tbody>
+                                    {{#each .}}
+                                    <tr>
+                                        <td class="lean header">{{@key}}</td>
+                                        <td class="content-wrappable">{{.}}</td>
+                                    </tr>
+                                    {{/each}}
+                                </tbody>
+                            </table>
+                        </tr>
                         {{/each}}
-                    </tbody>
-                  </table>
+                    </table>
+                </tr>
+                {{/builds}}
+                {{/openShiftData}}
+
+                {{^legacy}}
+                {{#deploymentMean}}
+                <tr>
+                    <table>
+                        <tr>
+                            <b>Deployment</b>
+                            <table>
+                                <tbody>
+                                    <tr>
+                                        <td class="lean header">Namespace</td>
+                                        <td class="content-wrappable">
+                                            {{ namespace }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">Managed by</td>
+                                        <td class="content-wrappable">
+                                            {{ type }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Source repository
+                                        </td>
+                                        <td class="content-wrappable">
+                                            <!-- TODO find where to get this from -->
+                                            {{../data/repo/url}}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Descriptor path
+                                        </td>
+                                        <td class="content-wrappable">
+                                            {{ descriptorPath }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Environment configuration files
+                                        </td>
+                                        <td class="content-wrappable">
+                                            {{{envConfigFiles}}}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Global configuration files
+                                        </td>
+                                        <td class="content-wrappable">
+                                            {{{configFiles}}}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Configuration parameters
+                                        </td>
+                                        <td class="content-wrappable">
+                                            {{{configParams}}}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Default command line flags
+                                        </td>
+                                        <td class="content-wrappable">
+                                            {{{defaultCmdLineArgs}}}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Additional command line flags
+                                        </td>
+                                        <td class="content-wrappable">
+                                            {{{additionalCmdLineArgs}}}
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </tr>
+                        {{#deploymentStatus}}
+                        <tr>
+                            <b>Deployment Result</b>
+                            <table>
+                                <tbody>
+                                    <tr>
+                                        <td class="lean header">Status</td>
+                                        <td class="content-wrappable">
+                                            {{ deployStatus }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">
+                                            Result message
+                                        </td>
+                                        <td class="content-wrappable">
+                                            {{ resultMessage }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">Timestamp</td>
+                                        <td class="content-wrappable">
+                                            {{ lastDeployed }}
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="lean header">Resources</td>
+                                        <td class="content-wrappable">
+                                            {{{resources}}}
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </tr>
+                        {{/deploymentStatus}}
+                    </table>
+                </tr>
+                {{/deploymentMean}}
+                {{/legacy}}
+                
+                {{#legacy}}
+                {{#deploymentMean}}
+                <tr>
+                    <table>
+                        <tr>
+                            <b>Deployment</b>
+                            <table>
+                                <thead>
+                                    <th>Name</th>
+                                    <th class="content-wrappable">Value</th>
+                                </thead>
+                                <tbody>
+                                    {{#each .}}
+                                    <tr>
+                                        <td>{{@key}}</td>
+                                        <td class="content-wrappable">
+                                            {{ this }}
+                                        </td>
+                                    </tr>
+                                    {{/each}}
+                                </tbody>
+                            </table>
+                        </tr>
+                    </table>
                 </tr>
-              {{/each}}
-              </table>
-            </tr>
-          {{/builds}}
-          {{#deployments}}
-            <tr>
-              <table>
-              {{#each .}}
+                {{/deploymentMean}}
+                {{#openShiftData}}
+                {{#deployments}}
                 <tr>
-                  Deployment Resource: <b>{{@key}}</b>
-                  <table>
-                    <thead>
-                        <th>Name</th>
-                        <th class="content-wrappable">Value</th>
-                    </thead>
-                    <tbody>
+                    <table>
                         {{#each .}}
-                          <tr>
-                            <td>{{@key}}</td><td class="content-wrappable">{{this}}</td>
-                          <tr>
+                        <tr>
+                            Deployment Resource:
+                            <b>{{@key}}</b>
+                            <table>
+                                <thead>
+                                    <th>Name</th>
+                                    <th class="content-wrappable">Value</th>
+                                </thead>
+                                <tbody>
+                                    {{#each .}}
+                                    <tr>
+                                        <td>{{@key}}</td>
+                                        <td class="content-wrappable">
+                                            {{ this }}
+                                        </td>
+                                    </tr>
+                                    {{/each}}
+                                </tbody>
+                            </table>
+                        </tr>
                         {{/each}}
-                    </tbody>
-                  </table>
+                    </table>
                 </tr>
-              {{/each}}
-              </table>
-            </tr>
-          {{/deployments}}
-        </table>
-        {{/openShiftData}}
-        {{/data.repo}}
-    </div>
-
-    <div class="page">
-        <h2 id="section_3"><span>3</span>Diagnostics and Testing</h2>
-        <p>Diagnostic steps have been successfully applied to the requested component.</p>
-
-        <h3>Diagnostic Status</h3>
-        <table class="no-page-break">
-            <tr>
-                <td>Status</td>
-                <td>OK</td>
-            </tr>
-        </table>
+                {{/deployments}}
+                {{/openShiftData}}
+                {{/legacy}}
+            </table>
+        </div>
 
-        <h3>Diagnostic Result</h3>
+        <div class="page">
+            <h2 id="section_3"><span>3</span>Diagnostics and Testing</h2>
+            <p>
+                Diagnostic steps have been successfully applied to the requested
+                component.
+            </p>
 
-        {{#data.repo}}
-        <h4>Component {{id}}</h4>
-        <table class="no-page-break">
-            <thead>
-                <th class="lean">Step</th>
-                <th class="content-wrappable">Instruction for Testing</th>
-                <th class="content-wrappable">Expected Result</th>
-                <th class="content-wrappable">Actual Result</th>
-                <th class="lean">Pass / Fail</th>
-            </thead>
-            <tbody>
+            <h3>Diagnostic Status</h3>
+            <table class="no-page-break">
                 <tr>
-                    <td class="lean">1</td>
-                    <td class="content-wrappable">automated configuration appplication (Q/P environment)</td>
-                    <td class="content-wrappable">Configuration applied</td>
-                    <td class="content-wrappable">Configuration applied</td>
-                    <td class="lean">pass</td>
+                    <td>Status</td>
+                    <td>OK</td>
                 </tr>
-                <tr>
-                    <td class="lean">2</td>
-                    <td class="content-wrappable">POD is running</td>
-                    <td class="content-wrappable">POD is in status running</td>
-                    <td class="content-wrappable">POD is in status running</td>
-                    <td class="lean">pass</td>
-                </tr>
-            </tbody>
-        </table>
-        {{/data.repo }}
-    </div>
+            </table>
 
-    <div class="page">
-        <h2 id="section_4"><span>4</span>Conclusion Statement</h2>
-        <p>All deliverables of the Technical Installation Plan have been successfully executed and the signature of this Report verifies that the system has been installed according to all requirements stated in the Installation Plan or, in the event the requirements are not met, that the deviations and/or failures are properly documented and addressed.</p>
-    </div>
+            <h3>Diagnostic Result</h3>
 
-    <div class="page">
-        <h2 id="section_5"><span>5</span>Definitions and Abbreviations</h2>
+            {{#data.repo}}
+            <h4>Component {{ id }}</h4>
+            <table class="no-page-break">
+                <thead>
+                    <th class="lean">Step</th>
+                    <th class="content-wrappable">Instruction for Testing</th>
+                    <th class="content-wrappable">Expected Result</th>
+                    <th class="content-wrappable">Actual Result</th>
+                    <th class="lean">Pass / Fail</th>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td class="lean">1</td>
+                        <td class="content-wrappable">
+                            Automated configuration appplication (Q/P
+                            environment)
+                        </td>
+                        <td class="content-wrappable">Configuration applied</td>
+                        <td class="content-wrappable">Configuration applied</td>
+                        <td class="lean">Pass</td>
+                    </tr>
+                    <tr>
+                        <td class="lean">2</td>
+                        <td class="content-wrappable">
+                            Wait until all Pods, PVCs, Services, and minimum
+                            number of Pods of a Deployment, StatefulSet, or
+                            ReplicaSet are in a ready state
+                        </td>
+                        <td class="content-wrappable">
+                            Applicable resources are in ready state
+                        </td>
+                        <td class="content-wrappable">
+                            Applicable resources are in ready state
+                        </td>
+                        <td class="lean">Pass</td>
+                    </tr>
+                </tbody>
+            </table>
+            {{/data.repo}}
+        </div>
 
-        <h3 id="section_5_1"><span>5.1</span>Definitions</h3>
-        {{#if data.sections.sec5s1.show}}
+        <div class="page">
+            <h2 id="section_4"><span>4</span>Conclusion Statement</h2>
+            <p>
+                All deliverables of the Technical Installation Plan have been
+                successfully executed and the signature of this Report verifies
+                that the system has been installed according to all requirements
+                stated in the Installation Plan or, in the event the
+                requirements are not met, that the deviations and/or failures
+                are properly documented and addressed.
+            </p>
+        </div>
+
+        <div class="page">
+            <h2 id="section_5"><span>5</span>Definitions and Abbreviations</h2>
+
+            <h3 id="section_5_1"><span>5.1</span>Definitions</h3>
+            {{#if data.sections.sec5s1.show}}
             <table class="no-border">
                 <tr>
-                    <td class="content-wrappable no-border">{{{data.sections.sec5s1.content}}}</td>
+                    <td class="content-wrappable no-border">
+                        {{{data.sections.sec5s1.content}}}
+                    </td>
                 </tr>
             </table>
-        {{else}}
+            {{else}}
             <p>N/A</p>
-        {{/if}}
+            {{/if}}
 
-        <h3 id="section_5_2"><span>5.2</span>Abbreviations</h3>
-        {{#if data.sections.sec5s2.show}}
+            <h3 id="section_5_2"><span>5.2</span>Abbreviations</h3>
+            {{#if data.sections.sec5s2.show}}
             <table class="no-border">
                 <tr>
-                    <td class="content-wrappable no-border">{{{data.sections.sec5s2.content}}}</td>
+                    <td class="content-wrappable no-border">
+                        {{{data.sections.sec5s2.content}}}
+                    </td>
                 </tr>
             </table>
-        {{else}}
+            {{else}}
             <p>N/A</p>
-        {{/if}}
-    </div>
+            {{/if}}
+        </div>
 
-    <div class="page">
-        <h2 id="section_6"><span>6</span>Reference Documents</h2>
-        <ul>
-            <li>Technical Installation Plan ({{metadata.referencedDocs.TIP}})</li></li>
-        </ul>
-        {{#if data.sections.sec6.show}}
+        <div class="page">
+            <h2 id="section_6"><span>6</span>Reference Documents</h2>
+            <ul>
+                <li>
+                    Technical Installation Plan ({{metadata.referencedDocs.TIP}})
+                </li>
+            </ul>
+            {{#if data.sections.sec6.show}}
             <table class="no-border">
                 <tr>
-                    <td class="content-wrappable no-border">{{{data.sections.sec6.content}}}</td>
+                    <td class="content-wrappable no-border">
+                        {{{data.sections.sec6.content}}}
+                    </td>
                 </tr>
             </table>
-        {{/if}}
-    </div>
+            {{/if}}
+        </div>
 
-    <div class="page">
-        <h2 id="section_7"><span>7</span>Document History</h2>
-        {{#if data.documentHistory}}
-        <table>
-            <thead>
-                <th class="lean">Version</th>
-                <th class="lean">Date</th>
-                <th class="lean">Author</th>
-                <th>Change Reference</th>
-            </thead>
-            <tbody>
-                {{#each data.documentHistory}}
-                <tr>
-                    <td class="lean">{{{docVersion}}}</td>
-                    <td colspan="2" class="content-wrappable">See Summary of electronic document or signature page of printout.</td>
-                    <td class="content-wrappable">
-                        {{{rational}}}
-                        <br>
-                        {{#each issueType}}
-                        {{#if added}}
-                        The following {{type}} were added:
-                        <ul>
-                            {{#each added}}
-                            <li>{{key}}{{#if details}}: {{details}}{{/if}}</li>
+        <div class="page">
+            <h2 id="section_7"><span>7</span>Document History</h2>
+            {{#if data.documentHistory}}
+            <table>
+                <thead>
+                    <th class="lean">Version</th>
+                    <th class="lean">Date</th>
+                    <th class="lean">Author</th>
+                    <th>Change Reference</th>
+                </thead>
+                <tbody>
+                    {{#each data.documentHistory}}
+                    <tr>
+                        <td class="lean">{{{docVersion}}}</td>
+                        <td colspan="2" class="content-wrappable">
+                            See Summary of electronic document or signature page
+                            of printout.
+                        </td>
+                        <td class="content-wrappable">
+                            {{{rational}}}
+                            <br />
+                            {{#each issueType}}
+                            {{#if added}}
+                            The following {{ type }} were added:
+                            <ul>
+                                {{#each added}}
+                                <li>
+                                    {{ key }}{{#if details}}: {{ details }}{{/if}}
+                                </li>
+                                {{/each}}
+                            </ul>
+                            {{/if}}
+                            {{#if discontinued}}
+                            The following {{ type }} were removed:
+                            <ul>
+                                {{#each discontinued}}
+                                <li>
+                                    {{ key }}{{#if details}}: {{ details }}{{/if}}
+                                </li>
+                                {{/each}}
+                            </ul>
+                            {{/if}}
+                            {{#if changed}}
+                            The following {{ type }} were changed:
+                            <ul>
+                                {{#each changed}}
+                                <li>
+                                    {{ key }} was previously {{ predecessors }}{{#if details}}: {{ details }}{{/if}}
+                                </li>
+                                {{/each}}
+                            </ul>
+                            {{/if}}
+                            <br />
                             {{/each}}
-                        </ul>
-                        {{/if}}
-                        {{#if discontinued}}
-                        The following {{type}} were removed:
-                        <ul>
-                            {{#each discontinued}}
-                            <li>{{key}}{{#if details}}: {{details}}{{/if}}</li>
-                            {{/each}}
-                        </ul>
-                        {{/if}}
-                        {{#if changed}}
-                        The following {{type}} were changed:
-                        <ul>
-                            {{#each changed}}
-                            <li>{{key}} was previously {{predecessors}}{{#if details}}: {{details}}{{/if}}</li>
-                            {{/each}}
-                        </ul>
-                        {{/if}}
-                        <br>
-                        {{/each}}
-                    </td>
-                </tr>
-                {{/each}}
-            </tbody>
-        </table>
-        {{/if}}
-        {{#if data.sections.sec7.show}}
+                        </td>
+                    </tr>
+                    {{/each}}
+                </tbody>
+            </table>
+            {{/if}}
+            {{#if data.sections.sec7.show}}
             <table class="no-border">
                 <tr>
-                    <td class="content-wrappable no-border">{{{data.sections.sec7.content}}}</td>
+                    <td class="content-wrappable no-border">
+                        {{{data.sections.sec7.content}}}
+                    </td>
                 </tr>
             </table>
-        {{/if}}
-    </div>
-</body>
+            {{/if}}
+        </div>
+    </body>
 </html>