diff --git a/themes/custom/az_barrio/templates/blocks/block--az-barrio-sidebar-menu.html.twig b/themes/custom/az_barrio/templates/blocks/block--az-barrio-sidebar-menu.html.twig
index b0226d0c24..135c857562 100644
--- a/themes/custom/az_barrio/templates/blocks/block--az-barrio-sidebar-menu.html.twig
+++ b/themes/custom/az_barrio/templates/blocks/block--az-barrio-sidebar-menu.html.twig
@@ -40,8 +40,11 @@
     az_remove_sidebar_menu_mobile ? 'd-none d-md-block'
   ]
 %}
+{% set base_navigation_label = configuration.label|default('Navigation'|t) %}
+{% set navigation_context = attributes.id matches '/mobile|offcanvas/' ? 'Mobile'|t : ('Sidebar'|t) %}
+{% set navigation_label = navigation_context ? navigation_context ~ ' ' ~ base_navigation_label : base_navigation_label %}
 {% set heading_id = attributes.id ~ '-menu'|clean_id %}
-<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.addClass(classes)|without('role', 'aria-labelledby') }}>
+<nav role="navigation" aria-label="{{ navigation_label }}"{{ attributes.addClass(classes)|without('role', 'aria-label') }}>
   {# Label. If not displayed, we still provide it for screen readers. #}
   {% if not configuration.label_display %}
     {% set title_attributes = title_attributes.addClass('visually-hidden') %}
diff --git a/themes/custom/az_barrio/templates/blocks/block--system-menu-block.html.twig b/themes/custom/az_barrio/templates/blocks/block--system-menu-block.html.twig
index d7a5b41ebc..26ed7d19c2 100644
--- a/themes/custom/az_barrio/templates/blocks/block--system-menu-block.html.twig
+++ b/themes/custom/az_barrio/templates/blocks/block--system-menu-block.html.twig
@@ -40,8 +40,11 @@
       'menu--' ~ derivative_plugin_id|clean_class,
     ]
   %}
+  {% set base_navigation_label = configuration.label|default('Navigation'|t) %}
+  {% set navigation_context = attributes.id matches '/mobile|offcanvas/' ? 'Mobile'|t : '' %}
+  {% set navigation_label = navigation_context ? navigation_context ~ ' ' ~ base_navigation_label : base_navigation_label %}
   {% set heading_id = attributes.id ~ '-menu'|clean_id %}
-  <nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.addClass(classes)|without('role', 'aria-labelledby') }}>
+  <nav role="navigation" aria-label="{{ navigation_label }}"{{ attributes.addClass(classes)|without('role', 'aria-label') }}>
     {# Label. If not displayed, we still provide it for screen readers. #}
     {% if not configuration.label_display %}
       {% set title_attributes = title_attributes.addClass('visually-hidden') %}
diff --git a/themes/custom/az_barrio/templates/navigation/pager.html.twig b/themes/custom/az_barrio/templates/navigation/pager.html.twig
index ac58aef40e..fcdc14af9d 100644
--- a/themes/custom/az_barrio/templates/navigation/pager.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/pager.html.twig
@@ -33,8 +33,8 @@
 {% set mobile_page_numbers_each_side_of_current = 1 %}
 {% set mobile_total_page_numbers_to_show = 2 * mobile_page_numbers_each_side_of_current + 1 %}
 {% if items %}
-  <nav role="navigation" aria-label="{{ heading_id }}">
-    <h3 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h3>
+  <nav role="navigation" aria-labelledby="{{ heading_id }}">
+    <h2 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h2>
     <ul class="pagination js-pager__items">
       {# Print first item if we are not on the first page. #}
       {% if items.first %}
diff --git a/themes/custom/az_barrio/templates/views/views-mini-pager.html.twig b/themes/custom/az_barrio/templates/views/views-mini-pager.html.twig
index 0a0e63024e..0348dbe07d 100644
--- a/themes/custom/az_barrio/templates/views/views-mini-pager.html.twig
+++ b/themes/custom/az_barrio/templates/views/views-mini-pager.html.twig
@@ -13,8 +13,8 @@
  */
 #}
 {% if items.previous or items.next %}
-  <nav role="navigation" aria-label="{{ heading_id }}">
-    <h3 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h3>
+  <nav role="navigation" aria-labelledby="{{ heading_id }}">
+    <h2 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h2>
     <ul class="js-pager__items pagination">
       {% if items.previous %}
         <li class="page-item">