diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue
index d3f0dc8a9b..06ab48e2a3 100644
--- a/src/components/home/contentAuth.vue
+++ b/src/components/home/contentAuth.vue
@@ -9,7 +9,7 @@
 			class="app-container"
 		>
 			<navigation/>
-			<div
+			<main
 				:class="[
 					{ 'is-menu-enabled': menuActive },
 					$route.name,
@@ -35,7 +35,7 @@
 				>
 					<icon icon="keyboard"/>
 				</a>
-			</div>
+			</main>
 		</div>
 	</div>
 </template>
diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index adf0bff953..9780e4f78f 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -1,6 +1,6 @@
 <template>
-	<div :class="{'is-active': menuActive}" class="namespace-container">
-		<div class="menu top-menu">
+	<aside :class="{'is-active': menuActive}" class="namespace-container">
+		<nav class="menu top-menu">
 			<router-link :to="{name: 'home'}" class="logo">
 				<Logo width="164" height="48" />
 			</router-link>
@@ -46,9 +46,9 @@
 					</router-link>
 				</li>
 			</ul>
-		</div>
+		</nav>
 
-		<aside class="menu namespaces-lists loader-container is-loading-small" :class="{'is-loading': loading}">
+		<nav class="menu namespaces-lists loader-container is-loading-small" :class="{'is-loading': loading}">
 			<template v-for="(n, nk) in namespaces" :key="n.id" >
 				<div class="namespace-title" :class="{'has-menu': n.id > 0}">
 					<span
@@ -145,9 +145,9 @@
 					</draggable>
 				</div>
 			</template>
-		</aside>
+		</nav>
 		<PoweredByLink />
-	</div>
+	</aside>
 </template>
 
 <script>
diff --git a/src/components/home/topNavigation.vue b/src/components/home/topNavigation.vue
index 190950a6f2..c0fad4db79 100644
--- a/src/components/home/topNavigation.vue
+++ b/src/components/home/topNavigation.vue
@@ -1,9 +1,8 @@
 <template>
-	<nav
+	<header
 		:class="{'has-background': background}"
 		aria-label="main navigation"
 		class="navbar main-theme is-fixed-top"
-		role="navigation"
 	>
 		<router-link :to="{name: 'home'}" class="logo-link">
 			<Logo width="164" height="48"/>
@@ -77,7 +76,7 @@
 				</dropdown>
 			</div>
 		</div>
-	</nav>
+	</header>
 </template>
 
 <script>
diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue
index fdefe4f9cd..949702c60f 100644
--- a/src/views/namespaces/ListNamespaces.vue
+++ b/src/views/namespaces/ListNamespaces.vue
@@ -22,7 +22,7 @@
 			</router-link>
 		</p>
 
-		<div :key="`n${n.id}`" class="namespace" v-for="n in namespaces">
+		<section :key="`n${n.id}`" class="namespace" v-for="n in namespaces">
 			<x-button
 				:to="{name: 'list.create', params: {id:  n.id}}"
 				class="is-pulled-right"
@@ -64,7 +64,7 @@
 					:show-archived="showArchived"
 				/>
 			</div>
-		</div>
+		</section>
 	</div>
 </template>