diff --git a/src/components/base/token_selector/token_container.vue b/src/components/base/token_selector/token_container.vue
index e817a42eff173b1fdd736c53430a7f8ef700c830..e0a7a844aca6d66f1daca734f260c6c7f7c36f32 100644
--- a/src/components/base/token_selector/token_container.vue
+++ b/src/components/base/token_selector/token_container.vue
@@ -132,11 +132,9 @@ export default {
     <div
       ref="tokenContainer"
       class="-gl-mx-1 -gl-my-1 gl-flex gl-w-auto gl-list-none gl-flex-wrap gl-items-center gl-p-0"
-      role="listbox"
-      aria-multiselectable="false"
-      aria-orientation="horizontal"
+      role="list"
       :aria-invalid="state === false && 'true'"
-      aria-label="token list"
+      aria-label="Selected tokens"
       @keydown.left="handleLeftArrow"
       @keydown.right="handleRightArrow"
       @keydown.home="handleHome"
@@ -151,7 +149,9 @@ export default {
         :key="token.id"
         :data-token-id="token.id"
         class="gl-token-selector-token-container gl-px-1 gl-py-2 gl-outline-none"
-        role="option"
+        role="listitem"
+        :aria-selected="focusedTokenIndex === index"
+        :aria-label="`${token.name}, selected token ${index + 1} of ${tokens.length}`"
         tabindex="-1"
         @focus="bindFocusEvent ? handleTokenFocus(index) : null"
       >
diff --git a/src/components/base/token_selector/token_selector.vue b/src/components/base/token_selector/token_selector.vue
index 0aa17f4a1865267e2c585b98673c4383eb8352f9..3e5759843b73bd76b118b78281e6fde201c9bfb7 100644
--- a/src/components/base/token_selector/token_selector.vue
+++ b/src/components/base/token_selector/token_selector.vue
@@ -156,6 +156,7 @@ export default {
       },
       resetFocusedDropdownItem: () => {},
       focusOnToken: () => {},
+      liveAnnouncement: '',
     };
   },
   computed: {
@@ -332,6 +333,9 @@ export default {
       this.$emit('token-add', dropdownItem);
 
       this.focusTextInput();
+
+      // Add announcement
+      this.liveAnnouncement = `Added ${dropdownItem.name}`;
     },
     removeToken(token) {
       /**
@@ -349,6 +353,9 @@ export default {
        * @property {object} token
        */
       this.$emit('token-remove', token);
+
+      // Add announcement
+      this.liveAnnouncement = `Removed ${token.name}`;
     },
     cancelTokenFocus() {
       this.focusTextInput();
@@ -381,6 +388,9 @@ export default {
     clearAll() {
       this.$emit('input', []);
       this.focusTextInput();
+
+      // Add announcement
+      this.liveAnnouncement = `All tokens cleared`;
     },
   },
 };
@@ -401,6 +411,11 @@ export default {
       ]"
       @click="handleContainerClick"
     >
+      <!-- Add a live region for announcements -->
+      <div ref="announcer" class="sr-only" aria-live="polite">
+        {{ liveAnnouncement }}
+      </div>
+
       <!-- @slot Optional content to display a placeholder when tokens list is empty
         and user doesn't edit tokens -->
       <slot v-if="showEmptyPlaceholder" name="empty-placeholder"></slot>
@@ -427,6 +442,14 @@ export default {
           <input
             ref="textInput"
             type="text"
+            role="combobox"
+            :aria-expanded="dropdownIsOpen"
+            :aria-controls="`${$options.componentId}-dropdown`"
+            :aria-activedescendant="
+              focusedDropdownItem
+                ? `${$options.componentId}-dropdown-item-${focusedDropdownItem.id}`
+                : null
+            "
             class="gl-token-selector-input gl-h-auto gl-w-4/10 gl-grow gl-border-none gl-bg-transparent gl-px-1 gl-font-regular gl-text-base gl-leading-normal gl-text-default gl-outline-none"
             :value="inputText"
             :autocomplete="autocomplete"