diff --git a/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/carousel.html b/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/carousel.html
index a8833549bc..2f39dd8984 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/carousel.html
+++ b/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/carousel.html
@@ -19,9 +19,8 @@
      data-panelcontainer="${wcmmode.edit && 'carousel'}"
      id="${carousel.id}"
      class="cmp-carousel"
-     role="group"
+     role="region"
      aria-label="${carousel.accessibilityLabel}"
-     aria-live="polite"
      aria-roledescription="carousel"
      data-cmp-is="carousel"
      data-cmp-autoplay="${(wcmmode.edit || wcmmode.preview) ? '' : carousel.autoplay}"
@@ -29,7 +28,22 @@
      data-cmp-autopause-disabled="${carousel.autopauseDisabled}"
      data-cmp-data-layer="${carousel.data.json}"
      data-placeholder-text="${wcmmode.edit && 'Please add Carousel components here' @ i18n}">
-    <sly data-sly-call="${controlsTemplate.controls @ carousel=carousel}" data-sly-test="${carousel.controlsPrepended}"></sly>
+	<sly data-sly-call="${controlsTemplate.controls @ carousel=carousel}" data-sly-test="${carousel.controlsPrepended}"></sly>
+	<div class="cmp-carousel__indicators"
+		role="tablist"
+		aria-label="${carousel.accessibilityTablist || 'Choose a slide to display' @ i18n}"
+		data-cmp-hook-carousel="indicators">
+		<button data-sly-repeat.item="${items}"
+			id="${item.id}-tab"
+			class="cmp-carousel__indicator${item.name == carousel.activeItem ? ' cmp-carousel__indicator--active' : ''}"
+			role="tab"
+			type="button"
+			aria-controls="${item.id}-tabpanel"
+			title="${'Slide {0}' @ format=[itemList.count], i18n}"		
+			data-cmp-hook-carousel="indicator"
+			aria-selected="${item.name == carousel.activeItem ? 'true' : 'false'}" 
+			tabindex="${item.name == carousel.activeItem ? '0' : '-1'}">${'Slide {0}' @ format=[itemList.count], i18n}</button>
+	</div>
     <div data-sly-set.items="${carousel.children || carousel.items}"
          data-sly-test="${items && items.size > 0}"
          class="cmp-carousel__content"
@@ -40,24 +54,12 @@
              id="${item.id}-tabpanel"
              class="cmp-carousel__item${item.name == carousel.activeItem ? ' cmp-carousel__item--active' : ''}"
              role="tabpanel"
-             aria-labelledby="${item.id}-tab"
              aria-roledescription="slide"
              aria-label="${(carousel.accessibilityAutoItemTitles && item.title) || 'Slide {0} of {1}' @ format=[itemList.count, carousel.items.size], i18n}"
              data-cmp-data-layer="${item.data.json}"
-             data-cmp-hook-carousel="item"></div>
+             data-cmp-hook-carousel="item"
+             tabindex="-1"></div>
         <sly data-sly-call="${controlsTemplate.controls @ carousel=carousel}" data-sly-test="${!carousel.controlsPrepended}"></sly>
-        <ol class="cmp-carousel__indicators"
-            role="tablist"
-            aria-label="${carousel.accessibilityTablist || 'Choose a slide to display' @ i18n}"
-            data-cmp-hook-carousel="indicators">
-            <li data-sly-repeat.item="${items}"
-                id="${item.id}-tab"
-                class="cmp-carousel__indicator${item.name == carousel.activeItem ? ' cmp-carousel__indicator--active' : ''}"
-                role="tab"
-                aria-controls="${item.id}-tabpanel"
-                aria-label="${'Slide {0}' @ format=[itemList.count], i18n}"
-                data-cmp-hook-carousel="indicator">${item.title}</li>
-        </ol>
     </div>
     <sly data-sly-resource="${resource.path @ resourceType='wcm/foundation/components/parsys/newpar', appendPath='/*', decorationTagName='div', cssClassName='new section aem-Grid-newComponent'}"
          data-sly-test="${(wcmmode.edit || wcmmode.preview) && items.size < 1}"></sly>
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/controls.html b/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/controls.html
index 7c17663e5c..49839dc2a2 100644
--- a/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/controls.html
+++ b/content/src/content/jcr_root/apps/core/wcm/components/carousel/v1/carousel/controls.html
@@ -19,6 +19,7 @@
         <button class="cmp-carousel__action cmp-carousel__action--previous"
                 type="button"
                 aria-label="${carousel.accessibilityPrevious || 'Previous' @ i18n}"
+				title="${carousel.accessibilityPrevious || 'Previous' @ i18n}"
                 data-cmp-hook-carousel="previous">
             <span class="cmp-carousel__action-icon"></span>
             <span class="cmp-carousel__action-text">${carousel.accessibilityPrevious || 'Previous' @ i18n}</span>
@@ -26,6 +27,7 @@
         <button class="cmp-carousel__action cmp-carousel__action--next"
                 type="button"
                 aria-label="${carousel.accessibilityNext || 'Next' @ i18n}"
+				title="${carousel.accessibilityNext || 'Next' @ i18n}"
                 data-cmp-hook-carousel="next">
             <span class="cmp-carousel__action-icon"></span>
             <span class="cmp-carousel__action-text">${carousel.accessibilityNext || 'Next' @ i18n}</span>
@@ -34,6 +36,7 @@
                 class="cmp-carousel__action cmp-carousel__action--pause"
                 type="button"
                 aria-label="${carousel.accessibilityPause || 'Pause' @ i18n}"
+				title="${carousel.accessibilityPause || 'Pause' @ i18n}"
                 data-cmp-hook-carousel="pause">
             <span class="cmp-carousel__action-icon"></span>
             <span class="cmp-carousel__action-text">${carousel.accessibilityPause || 'Pause' @ i18n}</span>
@@ -42,6 +45,7 @@
                 class="cmp-carousel__action cmp-carousel__action--play cmp-carousel__action--disabled"
                 type="button"
                 aria-label="${carousel.accessibilityPlay || 'Play' @ i18n}"
+				title="${carousel.accessibilityPlay || 'Play' @ i18n}"
                 data-cmp-hook-carousel="play">
             <span class="cmp-carousel__action-icon"></span>
             <span class="cmp-carousel__action-text">${carousel.accessibilityPlay || 'Play' @ i18n}</span>