diff --git a/InventoryGroupedProductIndexer/Indexer/SelectBuilder.php b/InventoryGroupedProductIndexer/Indexer/SelectBuilder.php
index d60f84048ca0..9ff23854a131 100644
--- a/InventoryGroupedProductIndexer/Indexer/SelectBuilder.php
+++ b/InventoryGroupedProductIndexer/Indexer/SelectBuilder.php
@@ -20,13 +20,14 @@
 use Magento\InventoryMultiDimensionalIndexerApi\Model\Alias;
 use Magento\InventoryMultiDimensionalIndexerApi\Model\IndexNameBuilder;
 use Magento\InventoryMultiDimensionalIndexerApi\Model\IndexNameResolverInterface;
+use Magento\InventoryIndexer\Indexer\SelectBuilderInterface;
 
 /**
  * Class to prepare select for partial reindex
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SelectBuilder
+class SelectBuilder implements SelectBuilderInterface
 {
     /**
      * @var ResourceConnection
diff --git a/InventoryGroupedProductIndexer/etc/di.xml b/InventoryGroupedProductIndexer/etc/di.xml
index b2ed95561655..05757e07c6b3 100644
--- a/InventoryGroupedProductIndexer/etc/di.xml
+++ b/InventoryGroupedProductIndexer/etc/di.xml
@@ -10,10 +10,6 @@
     <type name="Magento\InventoryIndexer\Indexer\SourceItem\Strategy\Sync">
         <plugin name="grouped_product_index" type="Magento\InventoryGroupedProductIndexer\Plugin\InventoryIndexer\Indexer\SourceItem\Strategy\Sync\SourceItemIndexerPlugin" />
     </type>
-    <type name="Magento\InventoryIndexer\Indexer\Stock\Strategy\Sync">
-        <plugin name="grouped_product_index_list" type="Magento\InventoryGroupedProductIndexer\Plugin\InventoryIndexer\Indexer\Stock\Strategy\Sync\ReindexListPlugin" />
-        <plugin name="grouped_product_index_full" type="Magento\InventoryGroupedProductIndexer\Plugin\InventoryIndexer\Indexer\Stock\Strategy\Sync\ReindexFullPlugin" />
-    </type>
     <type name="Magento\InventoryGroupedProductIndexer\Indexer\Stock\StockIndexer">
         <arguments>
             <argument name="indexHandler" xsi:type="object">Magento\InventoryIndexer\Indexer\IndexHandler</argument>
@@ -32,4 +28,11 @@
             <argument name="tableNameStockSourceLink" xsi:type="const">Magento\Inventory\Model\ResourceModel\StockSourceLink::TABLE_NAME_STOCK_SOURCE_LINK</argument>
         </arguments>
     </type>
+    <type name="Magento\InventoryIndexer\Indexer\Stock\IndexDataProviderByStockId">
+        <arguments>
+            <argument name="selectBuilders" xsi:type="array">
+                <item name="grouped_product" xsi:type="object">Magento\InventoryGroupedProductIndexer\Indexer\SelectBuilder</item>
+            </argument>
+        </arguments>
+    </type>
 </config>