diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8915216..ae794a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+
+## 1.2.9 - 2024-08-26
+- Make risk level column in Overview of Unit Tested Modules (in DTP and DTR) wrappable  ([#144](https://github.com/opendevstack/ods-document-generation-templates/pull/144))
+- Fix CSD file with block containing N/A always present ([#147](https://github.com/opendevstack/ods-document-generation-templates/pull/147))
+
 ## 1.2.8 - 2024-06-06
 - RA doc in section 4.1 has got a typo in Description of column Requirement ([#142](https://github.com/opendevstack/ods-document-generation-templates/pull/142))
 - Changed the branch name to N/A in the TIP for not included component ([#141](https://github.com/opendevstack/ods-document-generation-templates/pull/141))
diff --git a/templates/CSD-1.html.tmpl b/templates/CSD-1.html.tmpl
index 16fea89..83eb8f9 100644
--- a/templates/CSD-1.html.tmpl
+++ b/templates/CSD-1.html.tmpl
@@ -198,7 +198,7 @@
                     </table>
                 {{/each}}
              {{else}}
-             <p>N/A</p>/p>
+             <p>N/A</p>
              {{/if}}
 
 
diff --git a/templates/CSD-5.html.tmpl b/templates/CSD-5.html.tmpl
index 59d0f96..ee2c7dc 100644
--- a/templates/CSD-5.html.tmpl
+++ b/templates/CSD-5.html.tmpl
@@ -268,7 +268,6 @@
                                 <td class="lean">{{applicability}}</td>
                             </tr>
                             {{/each}}
-             <p>N/A</p>
                     </table>
                 {{/each}}
              {{else}}
diff --git a/templates/DTP.html.tmpl b/templates/DTP.html.tmpl
index 27cca31..4916de9 100644
--- a/templates/DTP.html.tmpl
+++ b/templates/DTP.html.tmpl
@@ -193,7 +193,7 @@
                     <td class="content-wrappable">{{systemRequirement}}</td>
                     <td class="lean">{{testKey}}</td>
                     <td class="content-wrappable">{{{softwareDesignSpec}}}</td>
-                    <td class="lean">{{riskLevel}}</td>
+                    <td class="content-wrappable">{{riskLevel}}</td>
                     <td class="content-wrappable">{{{description}}}</td>
                     <td class="lean">&nbsp;</td>
                     <td class="lean">&nbsp;</td>
diff --git a/templates/DTR.html.tmpl b/templates/DTR.html.tmpl
index 496764b..2afc72e 100644
--- a/templates/DTR.html.tmpl
+++ b/templates/DTR.html.tmpl
@@ -133,7 +133,7 @@
                     <td class="content-wrappable">{{systemRequirement}}</td>
                     <td class="lean">{{key}}</td>
                     <td class="content-wrappable">{{{softwareDesignSpec}}}</td>
-                    <td class="lean">{{riskLevel}}</td>
+                    <td class="content-wrappable">{{riskLevel}}</td>
                     <td class="content-wrappable">{{{description}}}</td>
                     <td class="lean">{{success}}</td>
                     <td class="lean">{{remarks}}</td>