diff --git a/bootstrap_barrio.libraries.yml b/bootstrap_barrio.libraries.yml
index 4a6e7151a824b01ffbc0976c0cd955a8cfccbcc7..e52e2fa8796c8694c3d51f3629783082316986e9 100644
--- a/bootstrap_barrio.libraries.yml
+++ b/bootstrap_barrio.libraries.yml
@@ -357,8 +357,8 @@ views.ajax:
 
 bootstrap:
   js:
-    /libraries/popper.js/dist/umd/popper.min.js: {}
-    /libraries/bootstrap/dist/js/bootstrap.min.js: {}
+    /libraries/popper.js/dist/umd/popper.min.js: { weight: -49 }
+    /libraries/bootstrap/dist/js/bootstrap.min.js: { weight: -48 }
   css:
     component:
       /libraries/bootstrap/dist/css/bootstrap.min.css: {}
diff --git a/subtheme/bootstrap_barrio_subtheme.libraries.yml b/subtheme/bootstrap_barrio_subtheme.libraries.yml
index 767f99335944c3b27176063f95dd131a36ce085e..1a159828d138823fc44a55723407c51b476f1e9d 100644
--- a/subtheme/bootstrap_barrio_subtheme.libraries.yml
+++ b/subtheme/bootstrap_barrio_subtheme.libraries.yml
@@ -8,17 +8,17 @@ global-styling:
       css/colors.css: {}
 bootstrap:
   js:
-    /libraries/popper.js/dist/umd/popper.min.js: {}
-    /libraries/bootstrap/dist/js/bootstrap.min.js: {}
+    /libraries/popper.js/dist/umd/popper.min.js: { weight: -49 }
+    /libraries/bootstrap/dist/js/bootstrap.min.js: { weight: -48 }
   css:
     component:
       /libraries/bootstrap/dist/css/bootstrap.min.css: {}
 bootstrap_cdn:
   js:
-    //cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js: {}
+    //cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js: {}
   css:
     component:
-      //cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/css/bootstrap.min.css: {}
+      //cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css: {}
 color.preview:
   version: VERSION
   css:
diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
index 704380c685398e7feede66401b60d1d9bd8f9476..656a09cf0c525897dd95d3fcbe8b2bb75bfc0ad4 100644
--- a/templates/layout/page.html.twig
+++ b/templates/layout/page.html.twig
@@ -94,7 +94,7 @@
           {% endif %}
             {{ page.header }}
             {% if page.primary_menu or page.header_form %}
-              <button class="navbar-toggler" type="button" data-bs-toggle="{{ navbar_collapse_btn_data }}" data-bs-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+              <button class="navbar-toggler collapsed" type="button" data-bs-toggle="{{ navbar_collapse_btn_data }}" data-bs-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
               <div class="{{ navbar_collapse_class }}" id="CollapsingNavbar">
                 {% if navbar_offcanvas %}
                   <div class="offcanvas-header">