diff --git a/src/public/modules/users/views/static/terms.client.view.html b/src/public/modules/users/views/static/terms.client.view.html
index 3827cb6517..c3a1e091f5 100644
--- a/src/public/modules/users/views/static/terms.client.view.html
+++ b/src/public/modules/users/views/static/terms.client.view.html
@@ -103,7 +103,8 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">
                 or liability to you whatsoever, whereupon all rights granted to
                 you hereunder shall also terminate forthwith. You shall further
                 upon notice from GovTech return or destroy all copies of the
-                Service or materials therein that you may have downloaded.
+                Service or materials therein that you may have been provided
+                with.
               </li>
             </ol>
           </li>
@@ -253,6 +254,11 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">
             Party Terms increases the liability of GovTech beyond that stated in
             Clause 6.
           </li>
+          <li seq="4.7">
+            Without prejudice and in addition to the foregoing, GovTech shall
+            not be responsible for your use of any software or service of a
+            Third Party.
+          </li>
         </ol>
       </li>
       <li seq="5" class="tou-point-header">
@@ -443,6 +449,24 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">
             transmit any malicious code, illegal, infringing or undesirable
             content or materials to GovTech or its agents or any Third Party.
           </li>
+          <li seq="6.6">
+            Without prejudice and in addition to GovTech’s other rights herein:
+            <ol>
+              <li seq="6.6.1">
+                in no event shall GovTech’s total cumulative liability arising
+                out of or in connection with these Terms of Use to you exceed
+                the amount of fees or payment received by GovTech (and not paid
+                or given to any Third Party by GovTech) from you for the Service
+                in the 12 months preceding the date of the first cause of
+                action; and
+              </li>
+              <li seq="6.6.2">
+                no action may be brought by you against GovTech arising out of
+                or in connection with these Terms of Use more than one (1) year
+                after the cause of action arose.
+              </li>
+            </ol>
+          </li>
         </ol>
       </li>
       <li seq="7" class="tou-point-header">
@@ -590,7 +614,7 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">
     </ol>
 
     <br /><br />
-    <center>These Terms of Use is dated 24 Nov 2020.</center>
+    <center>These Terms of Use are dated 19 Oct 2021.</center>
     <br />
     <h1 class="hidden-xs static-view-header">SCHEDULE</h1>
     <h2 class="hidden-sm hidden-md hidden-lg static-view-header">SCHEDULE</h2>
@@ -608,7 +632,7 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">SCHEDULE</h2>
             Notwithstanding anything in the Terms of Use, the Service is
             intended for use by a Singapore public sector agency or a healthcare
             institution that is under the NHG, SingHealth, or NUHS healthcare
-            clusters only.
+            clusters only. "You" in (a) to (e) refers to such entities.
           </li>
           <li seq="(b)">
             This Service is a form builder tool for the permitted entities
@@ -625,7 +649,12 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">SCHEDULE</h2>
             use, linking, or publication of your own privacy policy/statement
             applying to the form. GovTech is not responsible for your compliance
             with the applicable rules or laws, or for any failure by you to
-            provide a privacy policy/statement.
+            provide a privacy policy/statement. Additionally, you acknowledge
+            that the Service is not intended to collect any data or information
+            which may be governed by or is subject to the Health Insurance
+            Portability and Accountability Act (“HIPAA”). You warrant and
+            represent that any data or information submitted by you or your form
+            respondents shall not be subject to the HIPAA.
           </li>
           <li seq="(e)">
             GovTech shall have the right to give your form respondents notice of
@@ -633,7 +662,7 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">SCHEDULE</h2>
           </li>
         </ol>
 
-        <span>If you are responding to a form, (f) to (g) apply to you: </span>
+        <span>If you are responding to a form, (f) to (i) apply to you: </span>
         <ol>
           <li seq="(f)">The Terms of Use apply to you.</li>
           <li seq="(g)">
@@ -644,6 +673,13 @@ <h2 class="hidden-sm hidden-md hidden-lg static-view-header">SCHEDULE</h2>
             GovTech’s Terms of Use and Privacy Policy apply in addition to any
             terms or privacy policy/statement of the form creator.
           </li>
+          <li seq="(i)">
+            You acknowledge that the Service is not intended to collect any data
+            or information which may be governed by or subject to the Health
+            Insurance Portability and Accountability Act ("HIPAA"). Without
+            prejudice and in addition to GovTech’s rights under the Terms of
+            Use, you hereby waive any of your rights under any HIPAA.
+          </li>
         </ol>
       </li>
       <li seq="3" class="tou-point-header">