diff --git a/mail_layout_preview/README.rst b/mail_layout_preview/README.rst
index 64c633ca..7c4e5589 100644
--- a/mail_layout_preview/README.rst
+++ b/mail_layout_preview/README.rst
@@ -81,12 +81,13 @@ Contributors
 -  Simone Orsi <simahawk@gmail.com>
 -  Phuc Tran Thanh <phuc@trobz.com>
 -  Son Ho <sonhd@trobz.com>
+-  Khoi (Kien Kim) <khoikk@trobz.com>
 
 Other credits
 -------------
 
-The development and migration of this module from 15.0 to 16.0 has been
-financially supported by:
+The development and migration of this module from 15.0 to 16.0 and from
+17.0 to 18.0 has been financially supported by:
 
 -  Camptocamp
 
diff --git a/mail_layout_preview/__manifest__.py b/mail_layout_preview/__manifest__.py
index 0c3d59c4..0090b11a 100644
--- a/mail_layout_preview/__manifest__.py
+++ b/mail_layout_preview/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Mail Preview",
     "summary": """
         Preview email templates in the browser""",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/social",
diff --git a/mail_layout_preview/readme/CONTRIBUTORS.md b/mail_layout_preview/readme/CONTRIBUTORS.md
index 9f02bc7f..d639663a 100644
--- a/mail_layout_preview/readme/CONTRIBUTORS.md
+++ b/mail_layout_preview/readme/CONTRIBUTORS.md
@@ -1,3 +1,4 @@
 - Simone Orsi \<<simahawk@gmail.com>\>
 - Phuc Tran Thanh \<<phuc@trobz.com>\>
 - Son Ho \<<sonhd@trobz.com>\>
+- Khoi (Kien Kim) \<<khoikk@trobz.com>\>
diff --git a/mail_layout_preview/readme/CREDITS.md b/mail_layout_preview/readme/CREDITS.md
index 7c6b7a65..fea81e1f 100644
--- a/mail_layout_preview/readme/CREDITS.md
+++ b/mail_layout_preview/readme/CREDITS.md
@@ -1,4 +1,4 @@
-The development and migration of this module from 15.0 to 16.0 has been
-financially supported by:
+The development and migration of this module from 15.0 to 16.0 and
+from 17.0 to 18.0 has been financially supported by:
 
 - Camptocamp
diff --git a/mail_layout_preview/static/description/index.html b/mail_layout_preview/static/description/index.html
index 5f3eff23..83b37fe6 100644
--- a/mail_layout_preview/static/description/index.html
+++ b/mail_layout_preview/static/description/index.html
@@ -426,12 +426,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simahawk&#64;gmail.com">simahawk&#64;gmail.com</a>&gt;</li>
 <li>Phuc Tran Thanh &lt;<a class="reference external" href="mailto:phuc&#64;trobz.com">phuc&#64;trobz.com</a>&gt;</li>
 <li>Son Ho &lt;<a class="reference external" href="mailto:sonhd&#64;trobz.com">sonhd&#64;trobz.com</a>&gt;</li>
+<li>Khoi (Kien Kim) &lt;<a class="reference external" href="mailto:khoikk&#64;trobz.com">khoikk&#64;trobz.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
 <h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
-<p>The development and migration of this module from 15.0 to 16.0 has been
-financially supported by:</p>
+<p>The development and migration of this module from 15.0 to 16.0 and from
+17.0 to 18.0 has been financially supported by:</p>
 <ul class="simple">
 <li>Camptocamp</li>
 </ul>
diff --git a/mail_layout_preview/tests/test_layout_preview.py b/mail_layout_preview/tests/test_layout_preview.py
index 1d624252..5372a86f 100644
--- a/mail_layout_preview/tests/test_layout_preview.py
+++ b/mail_layout_preview/tests/test_layout_preview.py
@@ -76,4 +76,4 @@ def test_controller2(self):
         tmpl = self._create_template(self.env, model)
         response = self.url_open(self.base_url + f"{model}/{tmpl.id}/{partner.id}/")
         content = response.content.decode()
-        self.assertIn("<p>Hello %s</p>" % (partner.name), content)
+        self.assertIn(f"<p>Hello {partner.name}</p>", content)