diff --git a/layouts/partials/blocks/templates/call_to_action.html b/layouts/partials/blocks/templates/call_to_action.html
index 04ec297ecd54d8fb68a837b2c42cf1993c35feb2..547c4aa993a0118de3bd09686fb264c91986cecd 100644
--- a/layouts/partials/blocks/templates/call_to_action.html
+++ b/layouts/partials/blocks/templates/call_to_action.html
@@ -34,11 +34,11 @@
             {{- end -}}
           </div>
           {{ if .image }}
-            <figure>
+            <figure role="figure" {{- with or .alt .credit }} aria-label="{{ . | plainify }}" {{ end }}>
               {{ partial "commons/image.html"
                 (dict
                   "image"    .image.file
-                  "alt"      .image.alt
+                  "alt"      .alt
                   "sizes"    site.Params.image_sizes.blocks.call_to_action
               )}}
               {{ if partial "GetTextFromHTML" .credit }}
diff --git a/layouts/partials/blocks/templates/chapter.html b/layouts/partials/blocks/templates/chapter.html
index 98d83ac84cc3455928a23be465543e29701d8874..0360dcb9fc264b9760d8ad7d6f98dd9f534a10cb 100644
--- a/layouts/partials/blocks/templates/chapter.html
+++ b/layouts/partials/blocks/templates/chapter.html
@@ -30,7 +30,7 @@
             {{ end -}}
           </div>
           {{ if .image }}
-            <figure class="{{- $image_class -}}">
+            <figure role="figure" class="{{- $image_class -}}" {{- with or .alt .credit }} aria-label="{{ . | plainify }}" {{ end }}>
               {{ if not site.Params.image_sizes.design_system.lightbox.disabled }}
                 <a class="glightbox"
                   role="button"
@@ -44,6 +44,7 @@
                 {{ partial "commons/image.html"
                   (dict
                     "image"    .image
+                    "alt" .alt
                     "sizes"    site.Params.image_sizes.blocks.chapter
                   )}}
               {{ if not site.Params.image_sizes.design_system.lightbox.disabled }}
diff --git a/layouts/partials/blocks/templates/features.html b/layouts/partials/blocks/templates/features.html
index 8f7f9f82ddd31eeeb86a64aedaebb940bd1aaa52..b70ecccf48e377a1f3837ca492bdbe8effd8cc70 100644
--- a/layouts/partials/blocks/templates/features.html
+++ b/layouts/partials/blocks/templates/features.html
@@ -27,7 +27,7 @@
                   <p>{{ .description | safeHTML }}</p>
                 </div>
                 {{- if .image -}}
-                  <figure>
+                  <figure role="figure" {{- with or .alt .credit }} aria-label="{{ . | plainify }}" {{ end }}>
                     {{- partial "commons/image.html"
                       (dict
                         "image"    .image
diff --git a/layouts/partials/blocks/templates/gallery/carousel-image.html b/layouts/partials/blocks/templates/gallery/carousel-image.html
index 020b81420c901ddf3fdbb230c6520038ac1e1a31..e030a38f88fb64b11634ed422524afc6f7e762a4 100644
--- a/layouts/partials/blocks/templates/gallery/carousel-image.html
+++ b/layouts/partials/blocks/templates/gallery/carousel-image.html
@@ -5,7 +5,7 @@
   {{ if .file }}
     {{- $image := partial "GetMedia" .file -}}
     {{- if $image -}}
-      <figure {{ if $is_carousel }} id="carousel-item-{{$index}}" role="{{$role}}" aria-roledescription="slide" class="carousel__slide" aria-label="item-{{$index}}" {{ end }}>
+      <figure role="figure" {{ if $is_carousel }} id="carousel-item-{{$index}}" role="{{$role}}" aria-roledescription="slide" class="carousel__slide" aria-label="item-{{$index}} {{- with or .text .alt .credit }} | {{ . | plainify }} {{- end }}" {{ end }}>
         {{ partial "commons/image.html"
           (dict
             "image"    .id
diff --git a/layouts/partials/blocks/templates/gallery/large.html b/layouts/partials/blocks/templates/gallery/large.html
index 1e075c81a6b175259dfcfb70ba9f7fe3a4aa8c86..f51efb933e140a2dbf95cef87f2d9cef229cd809 100644
--- a/layouts/partials/blocks/templates/gallery/large.html
+++ b/layouts/partials/blocks/templates/gallery/large.html
@@ -4,7 +4,7 @@
       {{- $image := partial "GetMedia" .id -}}
       {{- $image_class := printf "image-%s" (partial "GetImageDirection" .) -}}
       {{- if $image -}}
-        <figure class="{{ $image_class  }}">
+        <figure role="figure" class="{{ $image_class  }}" {{- with or .text .alt .credit }} aria-label="{{ . | plainify }}" {{ end }}>
           {{ partial "commons/image.html"
             (dict
               "image"    .file
diff --git a/layouts/partials/blocks/templates/image.html b/layouts/partials/blocks/templates/image.html
index 9ca7cf9c7e38303c929ece89398c97a8da6bd80f..663f52f7d20b9900043020a78d2ab9c767b5632c 100644
--- a/layouts/partials/blocks/templates/image.html
+++ b/layouts/partials/blocks/templates/image.html
@@ -17,7 +17,7 @@
         )}}
 
         {{- with .image -}}
-          <figure class="{{ $image_class }}">
+          <figure role="figure" class="{{ $image_class }}" {{- with or $text .alt .credit }} aria-label="{{ . | plainify }}" {{ end }}>
             {{ if not site.Params.image_sizes.design_system.lightbox.disabled }}
               <a  class="glightbox"
                   role="button"
diff --git a/layouts/partials/blocks/templates/testimonials/single.html b/layouts/partials/blocks/templates/testimonials/single.html
index 78413b78b25ba70fec953fcaa7a5f4409a422e73..620628dd94f284e9d0b1466999fab4f6c26403a6 100644
--- a/layouts/partials/blocks/templates/testimonials/single.html
+++ b/layouts/partials/blocks/templates/testimonials/single.html
@@ -1,4 +1,4 @@
-<figure {{- if .is_carousel }} id="carousel-item-{{.index}}" role="{{.role}}" aria-roledescription="slide" class="carousel__slide" aria-label="{{.index}} / {{ .total }}" {{ end }} class="{{ if .is_carousel }}carousel__slide{{ end }} {{ if .params.photo }}with-picture{{ end }}">
+<figure role="figure" {{- if .is_carousel }} id="carousel-item-{{.index}}" role="{{.role}}" aria-roledescription="slide" class="carousel__slide" aria-label="{{.index}} / {{ .total }}" {{ end }} class="{{ if .is_carousel }}carousel__slide{{ end }} {{ if .params.photo }}with-picture{{ end }}">
   {{ with .params }}
     {{ $is_long := gt (len .text) 150 }}
     <blockquote {{- if $is_long }} class="is-long" {{- end }}>
diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html
index c736c8a8ae42a3d5189070e3571a2bbafb64164a..14d442148a65d76aeca2cc679d999659b3c7698d 100644
--- a/layouts/partials/footer/footer.html
+++ b/layouts/partials/footer/footer.html
@@ -1,3 +1,3 @@
-<footer id="document-footer">
+<footer id="document-footer" role="contentinfo">
   {{ partial "footer/footer-simple.html" . }}
 </footer>
diff --git a/layouts/partials/header/header.html b/layouts/partials/header/header.html
index e92304f4d532c12b906a5fa44033786d0a8945f5..5a5877aede460cef353c04fe256d6d53b9c7b774 100644
--- a/layouts/partials/header/header.html
+++ b/layouts/partials/header/header.html
@@ -1,6 +1,6 @@
 {{ $primary := partial "GetMenu" "primary" }}
 
-<header id="document-header">
+<header id="document-header" role="banner">
   <nav aria-label="{{ i18n "commons.menu.main" }}">
     <div class="container">
       {{ partial "header/logo.html" }}
diff --git a/layouts/partials/programs/image.html b/layouts/partials/programs/image.html
index 5774db7cab06dd34b1fb3f0092b40fb20885a2aa..6101fcdf74b88e493f48aaa0c166d3ea847b922c 100644
--- a/layouts/partials/programs/image.html
+++ b/layouts/partials/programs/image.html
@@ -1,5 +1,5 @@
 {{ if . }}
-  <figure class="featured-image">
+  <figure role="figure" class="featured-image">
     {{ partial "commons/image.html"
           (dict
             "image"    .