diff --git a/packages/_vue3-migration-test/src/components/animations/test-staggered-fade-and-slide.vue b/packages/_vue3-migration-test/src/components/animations/test-staggered-fade-and-slide.vue
index b6ba642c13..dadcd355f5 100644
--- a/packages/_vue3-migration-test/src/components/animations/test-staggered-fade-and-slide.vue
+++ b/packages/_vue3-migration-test/src/components/animations/test-staggered-fade-and-slide.vue
@@ -4,7 +4,7 @@
   <button @click="reset">Reset</button>
 
   <StaggeredFadeAndSlide :stagger="500">
-    <li v-for="(item, index) in items" :key="item.id" :data-index="index">
+    <li v-for="item in items" :key="item.id">
       {{ item.id }} - {{ item.name }}
       <button @click="remove(item)">x</button>
     </li>
@@ -21,9 +21,9 @@
   <br />
   <h1>Static content:</h1>
   <StaggeredFadeAndSlide :stagger="50">
-    <li key="1" data-index="0">Element to animate</li>
-    <li key="2" data-index="1">Element to animate</li>
-    <li key="3" data-index="2">Element to animate</li>
+    <li key="1">Element to animate</li>
+    <li key="2">Element to animate</li>
+    <li key="3">Element to animate</li>
   </StaggeredFadeAndSlide>
 </template>
 
diff --git a/packages/x-components/src/components/animations/staggered-fade-and-slide.vue b/packages/x-components/src/components/animations/staggered-fade-and-slide.vue
index fa2aab7248..b085b63231 100644
--- a/packages/x-components/src/components/animations/staggered-fade-and-slide.vue
+++ b/packages/x-components/src/components/animations/staggered-fade-and-slide.vue
@@ -145,9 +145,9 @@ or the `stagger` props:
 
 ```vue
 <StaggeredFadeAndSlide tag="ul" :stagger="50">
-  <li key="1" data-index="0">Element to animate</li>
-  <li key="2" data-index="1">Element to animate</li>
-  <li key="3" data-index="2">Element to animate</li>
+  <li key="1">Element to animate</li>
+  <li key="2">Element to animate</li>
+  <li key="3">Element to animate</li>
 </StaggeredFadeAndSlide>
 ```
 </docs>
diff --git a/packages/x-components/src/components/base-dropdown.vue b/packages/x-components/src/components/base-dropdown.vue
index f0600e6655..4bacbb459c 100644
--- a/packages/x-components/src/components/base-dropdown.vue
+++ b/packages/x-components/src/components/base-dropdown.vue
@@ -44,12 +44,7 @@
         role="listbox"
         tabindex="-1"
       >
-        <li
-          v-for="(item, index) in items"
-          :key="item.id || item"
-          :data-index="index"
-          class="x-dropdown__list-item"
-        >
+        <li v-for="(item, index) in items" :key="item.id || item" class="x-dropdown__list-item">
           <button
             :ref="el => (itemsButtonRefs[index] = el)"
             @click="emitSelectedItemChanged(item)"
diff --git a/packages/x-components/src/components/items-list.vue b/packages/x-components/src/components/items-list.vue
index 781521cb76..206beb7fa2 100644
--- a/packages/x-components/src/components/items-list.vue
+++ b/packages/x-components/src/components/items-list.vue
@@ -7,9 +7,8 @@
     data-test="items-list"
   >
     <li
-      v-for="(item, index) in computedItems"
+      v-for="item in computedItems"
       :key="item.id"
-      :data-index="index"
       class="x-items-list__item"
       :class="item.class"
       :data-test="item.dataTest"
diff --git a/packages/x-components/src/components/suggestions/base-suggestions.vue b/packages/x-components/src/components/suggestions/base-suggestions.vue
index f9ebb6e788..f7138f3f67 100644
--- a/packages/x-components/src/components/suggestions/base-suggestions.vue
+++ b/packages/x-components/src/components/suggestions/base-suggestions.vue
@@ -3,7 +3,6 @@
     <li
       v-for="(suggestion, index) in suggestionsToRender"
       :key="suggestionsKeys[index]"
-      :data-index="index"
       class="x-suggestions__item"
       :class="suggestionItemClass"
       data-test="suggestion-item"
diff --git a/packages/x-components/src/x-modules/facets/components/facets/facets.vue b/packages/x-components/src/x-modules/facets/components/facets/facets.vue
index 1df04f4578..7cb66653b1 100644
--- a/packages/x-components/src/x-modules/facets/components/facets/facets.vue
+++ b/packages/x-components/src/x-modules/facets/components/facets/facets.vue
@@ -1,9 +1,8 @@
 <template>
   <component :is="animation" v-if="hasFacets" class="x-facets-list" data-test="facets" tag="ul">
     <li
-      v-for="({ facet, slotNameById, slotNameByModelName }, facetId, index) in mappedFacets"
+      v-for="({ facet, slotNameById, slotNameByModelName }, facetId) in mappedFacets"
       :key="facetId"
-      :data-index="index"
       class="x-facets-list__item"
       data-test="facets-facet"
     >
diff --git a/packages/x-components/src/x-modules/facets/components/lists/filters-list.vue b/packages/x-components/src/x-modules/facets/components/lists/filters-list.vue
index 653200edaf..41b7be589a 100644
--- a/packages/x-components/src/x-modules/facets/components/lists/filters-list.vue
+++ b/packages/x-components/src/x-modules/facets/components/lists/filters-list.vue
@@ -8,9 +8,8 @@
     data-test="base-filters"
   >
     <li
-      v-for="(filter, index) in renderedFilters"
+      v-for="filter in renderedFilters"
       :key="filter.id"
-      :data-index="index"
       class="x-filters__item"
       data-test="base-filters-item"
     >
diff --git a/packages/x-components/src/x-modules/facets/components/lists/selected-filters-list.vue b/packages/x-components/src/x-modules/facets/components/lists/selected-filters-list.vue
index a6f61deeee..98f123fb14 100644
--- a/packages/x-components/src/x-modules/facets/components/lists/selected-filters-list.vue
+++ b/packages/x-components/src/x-modules/facets/components/lists/selected-filters-list.vue
@@ -11,9 +11,8 @@
       tag="ul"
     >
       <li
-        v-for="({ slotName, selectedFilter }, index) in mapSlot(selectedFilters)"
+        v-for="{ slotName, selectedFilter } in mapSlot(selectedFilters)"
         :key="selectedFilter.id"
-        :data-index="index"
         class="x-selected-filters-list__item"
         data-test="selected-filters-list-item"
       >
diff --git a/packages/x-components/src/x-modules/history-queries/components/my-history.vue b/packages/x-components/src/x-modules/history-queries/components/my-history.vue
index 75504de86d..c789d4a3bd 100644
--- a/packages/x-components/src/x-modules/history-queries/components/my-history.vue
+++ b/packages/x-components/src/x-modules/history-queries/components/my-history.vue
@@ -1,9 +1,8 @@
 <template>
   <component :is="animation" v-if="hasHistoryQueries" class="x-my-history" tag="ul">
     <li
-      v-for="(historyQueries, date, index) in groupByDate"
+      v-for="(historyQueries, date) in groupByDate"
       :key="date"
-      :data-index="index"
       class="x-my-history-item"
       data-test="my-history-item"
     >
diff --git a/packages/x-components/src/x-modules/identifier-results/components/identifier-results.vue b/packages/x-components/src/x-modules/identifier-results/components/identifier-results.vue
index eafed3231a..dd3ea1f051 100644
--- a/packages/x-components/src/x-modules/identifier-results/components/identifier-results.vue
+++ b/packages/x-components/src/x-modules/identifier-results/components/identifier-results.vue
@@ -1,9 +1,8 @@
 <template>
   <component :is="animation" v-if="identifierResults.length" tag="ul" class="x-identifier-results">
     <li
-      v-for="(identifierResult, index) in identifierResultsToRender"
+      v-for="identifierResult in identifierResultsToRender"
       :key="identifierResult.id"
-      :data-index="index"
       class="x-identifier-results__item"
       data-test="identifier-results-item"
     >
diff --git a/packages/x-components/src/x-modules/queries-preview/components/query-preview-list.vue b/packages/x-components/src/x-modules/queries-preview/components/query-preview-list.vue
index 697aec8ed4..2c4ba1a512 100644
--- a/packages/x-components/src/x-modules/queries-preview/components/query-preview-list.vue
+++ b/packages/x-components/src/x-modules/queries-preview/components/query-preview-list.vue
@@ -3,7 +3,6 @@
     <li
       v-for="(queryPreview, index) in renderedQueryPreviews"
       :key="index"
-      :data-index="index"
       data-test="query-preview-item"
     >
       <QueryPreview
diff --git a/packages/x-components/src/x-modules/recommendations/components/recommendations.vue b/packages/x-components/src/x-modules/recommendations/components/recommendations.vue
index 9befb6d5d3..4104077b2c 100644
--- a/packages/x-components/src/x-modules/recommendations/components/recommendations.vue
+++ b/packages/x-components/src/x-modules/recommendations/components/recommendations.vue
@@ -7,9 +7,8 @@
     class="x-recommendations"
   >
     <li
-      v-for="(recommendation, index) in recommendations"
+      v-for="recommendation in recommendations"
       :key="recommendation.id"
-      :data-index="index"
       class="x-recommendations__item"
       data-test="recommendation-item"
     >
diff --git a/packages/x-components/src/x-modules/related-tags/components/related-tags.vue b/packages/x-components/src/x-modules/related-tags/components/related-tags.vue
index bdedeffc62..42c473fddd 100644
--- a/packages/x-components/src/x-modules/related-tags/components/related-tags.vue
+++ b/packages/x-components/src/x-modules/related-tags/components/related-tags.vue
@@ -7,9 +7,8 @@
     data-test="related-tags"
   >
     <li
-      v-for="(relatedTag, index) in relatedTags"
+      v-for="relatedTag in relatedTags"
       :key="relatedTag.query"
-      :data-index="index"
       class="x-related-tags__item"
       data-test="related-tag-item"
     >
diff --git a/packages/x-components/src/x-modules/search/components/partial-results-list.vue b/packages/x-components/src/x-modules/search/components/partial-results-list.vue
index f0e5f88ff7..7af1027b26 100644
--- a/packages/x-components/src/x-modules/search/components/partial-results-list.vue
+++ b/packages/x-components/src/x-modules/search/components/partial-results-list.vue
@@ -9,7 +9,6 @@
     <li
       v-for="(partialResult, index) in partialResults"
       :key="`${partialResult.query}-${index}`"
-      :data-index="index"
       class="x-partial-result"
       data-test="partial-result"
     >
diff --git a/packages/x-components/src/x-modules/search/components/sort-list.vue b/packages/x-components/src/x-modules/search/components/sort-list.vue
index 04094c9a1c..7591acf891 100644
--- a/packages/x-components/src/x-modules/search/components/sort-list.vue
+++ b/packages/x-components/src/x-modules/search/components/sort-list.vue
@@ -1,9 +1,8 @@
 <template>
   <component :is="animation" tag="ul" class="x-option-list x-sort-list" data-test="sort-list">
     <li
-      v-for="({ item, cssClasses, event }, index) in listItems"
+      v-for="{ item, cssClasses, event } in listItems"
       :key="item"
-      :data-index="index"
       :class="cssClasses"
       class="x-option-list__item x-sort-list__item"
     >
diff --git a/packages/x-components/src/x-modules/search/components/sort-picker-list.vue b/packages/x-components/src/x-modules/search/components/sort-picker-list.vue
index dd244c075a..9239222fee 100644
--- a/packages/x-components/src/x-modules/search/components/sort-picker-list.vue
+++ b/packages/x-components/src/x-modules/search/components/sort-picker-list.vue
@@ -7,9 +7,8 @@
     role="list"
   >
     <BaseEventButton
-      v-for="({ item, cssClasses, event }, index) in listItems"
+      v-for="{ item, cssClasses, event } in listItems"
       :key="item"
-      :data-index="index"
       :class="[cssClasses, buttonClass]"
       data-test="sort-picker-button"
       :events="event"