diff --git a/website_snippet_country_dropdown/__manifest__.py b/website_snippet_country_dropdown/__manifest__.py
index 5b4fb88ff8..4ca10828f0 100644
--- a/website_snippet_country_dropdown/__manifest__.py
+++ b/website_snippet_country_dropdown/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Website Snippet Country Code Dropdown",
     "summary": "Allow to select country in a dropdown",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Website",
     "website": "https://github.com/OCA/website",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",
diff --git a/website_snippet_country_dropdown/static/src/js/web_tour_country_dropdown.js b/website_snippet_country_dropdown/static/src/js/web_tour_country_dropdown.js
index 4d57faf963..81a3fc78b1 100644
--- a/website_snippet_country_dropdown/static/src/js/web_tour_country_dropdown.js
+++ b/website_snippet_country_dropdown/static/src/js/web_tour_country_dropdown.js
@@ -2,7 +2,6 @@ odoo.define("website_snippet_country_dropdown.tour_demo_page", function (require
     "use strict";
 
     const tour = require("web_tour.tour");
-    const base = require("web_editor.base");
 
     const country_code_test = "ES";
     const vat_number_test = "B01010101";
@@ -11,7 +10,6 @@ odoo.define("website_snippet_country_dropdown.tour_demo_page", function (require
         "website_snippet_country_dropdown_tour_demo_page",
         {
             url: "/website_snippet_country_dropdown.demo_page",
-            wait_for: base.ready(),
         },
         [
             {
diff --git a/website_snippet_country_dropdown/views/snippets.xml b/website_snippet_country_dropdown/views/snippets.xml
index 88c6a91823..171d3cf65d 100644
--- a/website_snippet_country_dropdown/views/snippets.xml
+++ b/website_snippet_country_dropdown/views/snippets.xml
@@ -52,7 +52,7 @@
                     id="btn_vat_code"
                     t-att-disabled="readonly"
                     class="btn btn-outline-secondary dropdown-toggle js_btn_country_code form-control"
-                    data-toggle="dropdown"
+                    data-bs-toggle="dropdown"
                     t-att-data-country_code="default_country.code"
                 >
                     <img
@@ -82,17 +82,17 @@
                         </a>
                     </t>
                 </div>
-                <input
-                    id="country_code_field"
-                    type="text"
-                    size="2"
-                    tabindex="-1"
-                    class="input-group-text js_country_code_field"
-                    t-att-name="country_code_field"
-                    t-att-value="default_country.code"
-                    readonly="1"
-                />
             </div>
+            <input
+                id="country_code_field"
+                type="text"
+                size="2"
+                tabindex="-1"
+                class="input-group-text js_country_code_field"
+                t-att-name="country_code_field"
+                t-att-value="default_country.code"
+                readonly="1"
+            />
             <input
                 id="complete_field"
                 type="hidden"