diff --git a/web/themes/custom/opdavies/templates/block/block--system-menu-block.html.twig b/web/themes/custom/opdavies/templates/block/block--system-menu-block.html.twig
index 7664a98..4985922 100644
--- a/web/themes/custom/opdavies/templates/block/block--system-menu-block.html.twig
+++ b/web/themes/custom/opdavies/templates/block/block--system-menu-block.html.twig
@@ -34,7 +34,7 @@
 {% set heading_id = attributes.id ~ '-menu'|clean_id %}
 <nav
   class="h-full flex items-center"
-  role="navigation"
+  aria-labelledby="{{ heading_id }}"{{ attributes|without('role', 'aria-labelledby') }}
   aria-labelledby="{{ heading_id }}"{{ attributes|without('role', 'aria-labelledby') }}
 >
   {# Label. If not displayed, we still provide it for screen readers. #}
diff --git a/web/themes/custom/opdavies/templates/layout/page.html.twig b/web/themes/custom/opdavies/templates/layout/page.html.twig
index 760d956..0fb6534 100644
--- a/web/themes/custom/opdavies/templates/layout/page.html.twig
+++ b/web/themes/custom/opdavies/templates/layout/page.html.twig
@@ -87,7 +87,7 @@
 
       {{ page.help }}
 
-      <main role="main">
+      <main>
         <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
         <div class="grid grid-cols-1 gap-y-8 md:grid-cols-12 md:gap-x-8">
@@ -98,7 +98,7 @@
           </div>{# /.layout-content #}
 
           {% if page.sidebar_second %}
-            <aside role="complementary" class="sidebar col-span-12 md:col-span-4">
+            <aside class="sidebar col-span-12 md:col-span-4">
               {{ page.sidebar_second }}
             </aside>
           {% endif %}
@@ -106,7 +106,7 @@
       </main>
 
       {% if page.footer %}
-        <footer role="contentinfo">
+        <footer>
           {{ page.footer }}
         </footer>
       {% endif %}
diff --git a/web/themes/custom/opdavies/templates/node/node.html.twig b/web/themes/custom/opdavies/templates/node/node.html.twig
index ce84074..3088c9e 100644
--- a/web/themes/custom/opdavies/templates/node/node.html.twig
+++ b/web/themes/custom/opdavies/templates/node/node.html.twig
@@ -70,7 +70,7 @@
  *   in different view modes.
  */
 #}
-<article{{ attributes.addClass('node min-w-full prose') }}>
+<article{{ attributes.addClass('node min-w-full prose')|without('role') }}>
 
   {{ title_prefix }}
   {% if not page %}