diff --git a/themes/custom/az_barrio/templates/layout/page.html.twig b/themes/custom/az_barrio/templates/layout/page.html.twig
index 56321b960d..dd3ec31f5c 100644
--- a/themes/custom/az_barrio/templates/layout/page.html.twig
+++ b/themes/custom/az_barrio/templates/layout/page.html.twig
@@ -162,7 +162,7 @@
             {% if page.navigation %}
               <div class="row d-none d-lg-flex">
                 <div class="col-lg">
-                  <nav id="navbar-top" class="navbar navbar-expand{{ az_navbar ? ' navbar-az' }}">
+                  <nav id="navbar-top" class="navbar navbar-expand{{ az_navbar ? ' navbar-az' }}" aria-label="{{ 'Primary navigation'|t }}">
                     {{ page.navigation }}
                   </nav>
                 </div>
@@ -267,7 +267,7 @@
 
     <footer class="site-footer">
         {% if page.footer or page.footer_sub or footer_logo %}
-        <div class="text-bg-warm-gray py-5" role="contentinfo">
+        <div class="text-bg-warm-gray py-5">
           {% if page.footer or footer_logo %}
           <section{{ attributes.addClass(classes) }}>
             <div class="container">
diff --git a/themes/custom/az_barrio/templates/navigation/menu--main.html.twig b/themes/custom/az_barrio/templates/navigation/menu--main.html.twig
index 1fc0830493..d350fbc208 100644
--- a/themes/custom/az_barrio/templates/navigation/menu--main.html.twig
+++ b/themes/custom/az_barrio/templates/navigation/menu--main.html.twig
@@ -31,9 +31,9 @@
   {% if items %}
     {% if menu_level == 0 %}
       <ul{{ attributes.addClass('navbar-nav flex-lg-row') }}>
-{% else %}
-  <div class="dropdown-menu">
-{% endif %}
+    {% else %}
+      <ul class="dropdown-menu">
+    {% endif %}
     {% for item in items %}
       {%
         set classes = [
@@ -46,6 +46,8 @@
       %}
         {% if menu_level == 0 %}
         <li{{ item.attributes.addClass(classes) }}>
+        {% else %}
+        <li>
         {% endif %}
           {%
             set link_classes = [
@@ -63,14 +65,8 @@
           {% else %}
             {{ link(item.title, item.url, {'class': link_classes}) }}
           {% endif %}
-        {% if menu_level == 0 %}
         </li>
-        {% endif %}
     {% endfor %}
-    {% if menu_level == 0 %}
       </ul>
-    {% else %}
-      </div>
-    {% endif %}
   {% endif %}
 {% endmacro %}