diff --git a/website_forum_subscription/__manifest__.py b/website_forum_subscription/__manifest__.py
index 953f49f895..34bda3217f 100644
--- a/website_forum_subscription/__manifest__.py
+++ b/website_forum_subscription/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Website Forum Subscription",
     "summary": "Adds a button to allow subscription from the website",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Website",
     "website": "https://github.com/OCA/website",
     "author": ("Tecnativa, " "Odoo Community Association (OCA)"),
diff --git a/website_forum_subscription/templates/website_forum_templates.xml b/website_forum_subscription/templates/website_forum_templates.xml
index d6bd76bbd8..6cfe372d86 100644
--- a/website_forum_subscription/templates/website_forum_templates.xml
+++ b/website_forum_subscription/templates/website_forum_templates.xml
@@ -48,7 +48,7 @@
         name="Forum page subscription"
         inherit_id="website_forum.forum_index"
     >
-        <xpath expr="//div[@class='row g-0']" position="before">
+        <xpath expr="//table[hasclass('o_wforum_table')]" position="before">
             <t t-call="website_forum_subscription.follow">
                 <t t-set="object" t-value="forum" />
             </t>
@@ -59,7 +59,7 @@
         name="Forum card subscription"
         inherit_id="website_forum.forum_all_all_entries"
     >
-        <xpath expr="//t[@t-call='website_forum.forum_post_options']" position="after">
+        <xpath expr="//div[hasclass('text-truncate')]" position="after">
             <t t-call="website_forum_subscription.follow">
                 <t t-set="object" t-value="forum" />
             </t>