diff --git a/packages/components/src/components/tabs/tabs.hbs b/packages/components/src/components/tabs/tabs.hbs
index 3543b87edb10..387e2c9c8037 100644
--- a/packages/components/src/components/tabs/tabs.hbs
+++ b/packages/components/src/components/tabs/tabs.hbs
@@ -14,9 +14,10 @@
     {{#each items}}
     <li
       class="{{@root.prefix}}--tabs__nav-item{{#if selected}} {{@root.prefix}}--tabs__nav-item--selected{{/if}} {{#if disabled}} {{@root.prefix}}--tabs__nav-item--disabled {{/if}}"
-      data-target=".{{panelClass}}" role="presentation">
+      data-target=".{{panelClass}}" role="tab" {{#if selected}} aria-selected="true" {{/if}} {{#if disabled}}
+      aria-disabled="true" {{/if}}>
       <a tabindex="0" id="{{linkId}}" class="{{@root.prefix}}--tabs__nav-link" href="javascript:void(0)" role="tab"
-        aria-controls="{{panelId}}" {{#if selected}} aria-selected="true" {{/if}}>{{label}}</a>
+        aria-controls="{{panelId}}">{{label}}</a>
     </li>
     {{/each}}
   </ul>
@@ -29,4 +30,4 @@
     <p style="padding: 0 1rem; font-size: 14px; font-weight: 600;">{{panelContent}}</p>
   </div>
   {{/each}}
-</div>
+</div>
\ No newline at end of file