diff --git a/includes/templates/Footer.mustache b/includes/templates/Footer.mustache
index 034c9ad21..9a4f2ceff 100644
--- a/includes/templates/Footer.mustache
+++ b/includes/templates/Footer.mustache
@@ -14,7 +14,7 @@
 	footerRow[] array-footer-rows iterable list of footer rows
 }}
 {{{html-hook-vector-before-footer}}}
-<div id="footer" class="mw-footer" role="contentinfo" {{{html-userlangattributes}}}>
+<footer id="footer" class="mw-footer" role="contentinfo" {{{html-userlangattributes}}}>
 	{{#array-footer-rows}}
 	<ul id="{{id}}" {{#className}}class="{{.}}"{{/className}}>
 		{{#array-items}}
@@ -23,4 +23,4 @@
 	</ul>
 	{{/array-footer-rows}}
 	<div style="clear: both;"></div>
-</div>
+</footer>
diff --git a/includes/templates/Menu.mustache b/includes/templates/Menu.mustache
index 05f2b6af9..ffde1f91e 100644
--- a/includes/templates/Menu.mustache
+++ b/includes/templates/Menu.mustache
@@ -1,7 +1,7 @@
 {{!
 	See @typedef MenuDefinition
 }}
-<div id="{{id}}" role="navigation" class="{{class}}" aria-labelledby="{{label-id}}">
+<nav id="{{id}}" class="{{class}}" aria-labelledby="{{label-id}}">
 	{{#is-dropdown}}
 	<input type="checkbox" class="vectorMenuCheckbox" aria-labelledby="{{label-id}}" />
 	<h3 id="{{label-id}}">
@@ -14,4 +14,4 @@
 	<ul class="menu" {{{html-userlangattributes}}}>
 		{{{html-items}}}
 	</ul>
-</div>
+</nav>
diff --git a/includes/templates/Portal.mustache b/includes/templates/Portal.mustache
index e40f4807e..a026e7479 100644
--- a/includes/templates/Portal.mustache
+++ b/includes/templates/Portal.mustache
@@ -10,7 +10,7 @@ Each portal has the following composition:
 	string? html-after-portal
 	string? html-hook-vector-after-toolbox is deprecated and used by the toolbox portal.
 }}
-<div class="{{class}}" role="navigation" id="{{portal-id}}" {{{html-tooltip}}} aria-labelledby="{{msg-label-id}}">
+<nav class="{{class}}" id="{{portal-id}}" {{{html-tooltip}}} aria-labelledby="{{msg-label-id}}">
 	<h3 {{{html-userlangattributes}}} id="{{msg-label-id}}">
 		{{msg-label}}
 	</h3>
@@ -18,6 +18,6 @@ Each portal has the following composition:
 		{{{html-portal-content}}}
 		{{{html-after-portal}}}
 	</div>
-</div>
+</nav>
 {{! Note: html-hook-vector-after-toolbox is deprecated. }}
 {{{html-hook-vector-after-toolbox}}}
diff --git a/includes/templates/index.mustache b/includes/templates/index.mustache
index 1368458b5..02fd562cb 100644
--- a/includes/templates/index.mustache
+++ b/includes/templates/index.mustache
@@ -39,7 +39,7 @@
 
 <div id="mw-page-base" class="mw-header-placeholder noprint"></div>
 
-<div id="content" class="mw-body" role="main">
+<main id="content" class="mw-body">
 	<a id="top"></a>
 	{{#html-sitenotice}}
 		<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>
@@ -67,7 +67,7 @@
 		<div class="visualClear"></div>
 		{{{html-debuglog}}}
 	</div>
-</div>
+</main>
 {{{html-dataAfterContent}}}
 
 <header class="mw-header">
diff --git a/includes/templates/legacy.mustache b/includes/templates/legacy.mustache
index d10a9a388..f70148937 100644
--- a/includes/templates/legacy.mustache
+++ b/includes/templates/legacy.mustache
@@ -37,7 +37,7 @@
 {{{html-headelement}}}
 <div id="mw-page-base" class="noprint"></div>
 <div id="mw-head-base" class="noprint"></div>
-<div id="content" class="mw-body" role="main">
+<main id="content" class="mw-body" role="main">
 	<a id="top"></a>
 	{{#html-sitenotice}}
 		<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>
@@ -65,7 +65,7 @@
 		<div class="visualClear"></div>
 		{{{html-debuglog}}}
 	</div>
-</div>
+</main>
 {{{html-dataAfterContent}}}
 <div id="mw-navigation">
 	<h2>{{{html-navigation-heading}}}</h2>