diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089a095..b4650e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 ## Unreleased
-
+- 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/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 4e73aed..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>
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">