diff --git a/composer.json b/composer.json
index edd6d56f8d..4923e15b3e 100644
--- a/composer.json
+++ b/composer.json
@@ -76,7 +76,7 @@
         "sylius-labs/doctrine-migrations-extra-bundle": "^0.2 || ^0.3",
         "sylius/fixtures-bundle": "^1.9",
         "sylius/grid": "^1.14",
-        "sylius/grid-bundle": "^1.14",
+        "sylius/grid-bundle": "^1.16@alpha",
         "sylius/mailer": "^2.1",
         "sylius/mailer-bundle": "^2.1",
         "sylius/registry": "^1.6",
diff --git a/config/packages/_sylius.yaml b/config/packages/_sylius.yaml
index 1aa9eff54d..5a4505b6f9 100644
--- a/config/packages/_sylius.yaml
+++ b/config/packages/_sylius.yaml
@@ -12,6 +12,76 @@ parameters:
 sylius_api:
     enabled: true
 
+sylius_core:
+    grid:
+        grids:
+            sylius_admin_admin_user:
+                use_legacy_config: false
+            sylius_admin_catalog_promotion:
+                use_legacy_config: false
+            sylius_admin_channel:
+                use_legacy_config: false
+            sylius_admin_channel_pricing_log_entry:
+                use_legacy_config: false
+            sylius_admin_country:
+                use_legacy_config: false
+            sylius_admin_currency:
+                use_legacy_config: false
+            sylius_admin_customer:
+                use_legacy_config: false
+            sylius_admin_customer_group:
+                use_legacy_config: false
+            sylius_admin_customer_order:
+                use_legacy_config: false
+            sylius_admin_exchange_rate:
+                use_legacy_config: false
+            sylius_admin_inventory:
+                use_legacy_config: false
+            sylius_admin_locale:
+                use_legacy_config: false
+            sylius_admin_order:
+                use_legacy_config: false
+            sylius_admin_payment:
+                use_legacy_config: false
+            sylius_admin_payment_method:
+                use_legacy_config: false
+            sylius_admin_payment_request:
+                use_legacy_config: false
+            sylius_admin_product_association_type:
+                use_legacy_config: false
+            sylius_admin_product_attribute:
+                use_legacy_config: false
+            sylius_admin_product:
+                use_legacy_config: false
+            sylius_admin_product_option:
+                use_legacy_config: false
+            sylius_admin_product_review:
+                use_legacy_config: false
+            sylius_admin_product_taxon:
+                use_legacy_config: false
+            sylius_admin_product_variant:
+                use_legacy_config: false
+            sylius_admin_product_variant_with_catalog_promotion:
+                use_legacy_config: false
+            sylius_admin_promotion:
+                use_legacy_config: false
+            sylius_admin_promotion_coupon:
+                use_legacy_config: false
+            sylius_admin_shipment:
+                use_legacy_config: false
+            sylius_admin_shipping_category:
+                use_legacy_config: false
+            sylius_admin_shipping_method:
+                use_legacy_config: false
+            sylius_admin_tax_category:
+                use_legacy_config: false
+            sylius_admin_tax_rate:
+                use_legacy_config: false
+            sylius_admin_taxon:
+                use_legacy_config: false
+            sylius_admin_zone:
+                use_legacy_config: false
+
 sylius_shop:
     product_grid:
         include_all_descendants: true
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php
index e67810b5a4..1fac644b0f 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/AdminUserGrid.php
@@ -24,11 +24,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_admin_user')]
-final class AdminUserGrid extends AbstractGrid implements AdminUserGridInterface
+final class AdminUserGrid implements AdminUserGridInterface
 {
     public function __construct(
         private readonly string $adminUserClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php
index 5cfbb91b70..bc247a0ef1 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CatalogPromotionGrid.php
@@ -26,12 +26,11 @@ use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 use Sylius\Component\Promotion\Model\CatalogPromotionStates;
 
 #[AsGrid(name: 'sylius_admin_catalog_promotion')]
-final class CatalogPromotionGrid extends AbstractGrid implements CatalogPromotionGridInterface
+final class CatalogPromotionGrid implements CatalogPromotionGridInterface
 {
     public function __construct(
         private readonly string $catalogPromotionClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php
index 7f459d4764..008ec67494 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelGrid.php
@@ -23,11 +23,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_channel')]
-final class ChannelGrid extends AbstractGrid implements ChannelGridInterface
+final class ChannelGrid implements ChannelGridInterface
 {
     public function __construct(
         private readonly string $channelClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php
index 126e810580..fa811cd6cf 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ChannelPricingLogEntryGrid.php
@@ -17,11 +17,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\DateTimeField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\DateFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_channel_pricing_log_entry')]
-final class ChannelPricingLogEntryGrid extends AbstractGrid implements ChannelPricingLogEntryGridInterface
+final class ChannelPricingLogEntryGrid implements ChannelPricingLogEntryGridInterface
 {
     public function __construct(
         private readonly string $channelPricingLogEntryClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php
index 6fc777d13d..56955471bc 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CountryGrid.php
@@ -20,11 +20,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_country')]
-final class CountryGrid extends AbstractGrid implements CountryGridInterface
+final class CountryGrid implements CountryGridInterface
 {
     public function __construct(
         private readonly string $countryClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php
index 10dbd48abb..67ff3d5c0b 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CurrencyGrid.php
@@ -19,11 +19,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_currency')]
-final class CurrencyGrid extends AbstractGrid implements CurrencyGridInterface
+final class CurrencyGrid implements CurrencyGridInterface
 {
     public function __construct(
         private readonly string $currencyClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php
index 0eb7e49e8e..5fe90566c6 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGrid.php
@@ -24,11 +24,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_customer')]
-final class CustomerGrid extends AbstractGrid implements CustomerGridInterface
+final class CustomerGrid implements CustomerGridInterface
 {
     public function __construct(
         private readonly string $customerClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php
index 223f6b1d1f..2950208ed8 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerGroupGrid.php
@@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_customer_group')]
-final class CustomerGroupGrid extends AbstractGrid implements CustomerGroupGridInterface
+final class CustomerGroupGrid implements CustomerGroupGridInterface
 {
     public function __construct(
         private readonly string $customerGroupClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php
index af4df3ab3f..f50f9cbd62 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/CustomerOrderGrid.php
@@ -16,11 +16,10 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_customer_order')]
-final class CustomerOrderGrid extends AbstractGrid implements CustomerOrderGridInterface
+final class CustomerOrderGrid implements CustomerOrderGridInterface
 {
     public function __construct(
         private readonly string $orderClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php
index ef5997540d..da399ff2ae 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ExchangeRateGrid.php
@@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_exchange_rate')]
-final class ExchangeRateGrid extends AbstractGrid implements ExchangeRateGridInterface
+final class ExchangeRateGrid implements ExchangeRateGridInterface
 {
     public function __construct(
         private readonly string $exchangeRateClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php
index 28af8ff6ba..9e4079cb36 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/InventoryGrid.php
@@ -19,11 +19,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_inventory')]
-final class InventoryGrid extends AbstractGrid implements InventoryGridInterface
+final class InventoryGrid implements InventoryGridInterface
 {
     public function __construct(
         private readonly string $productVariantClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php
index 47bcd66647..e5d3b86a6e 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/LocaleGrid.php
@@ -20,11 +20,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_locale')]
-final class LocaleGrid extends AbstractGrid implements LocaleGridInterface
+final class LocaleGrid implements LocaleGridInterface
 {
     public function __construct(
         private readonly string $localeClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php
index 72239ef572..5aa042118f 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/OrderGrid.php
@@ -21,11 +21,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_order')]
-final class OrderGrid extends AbstractGrid implements OrderGridInterface
+final class OrderGrid implements OrderGridInterface
 {
     public function __construct(
         private readonly string $orderClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php
index e9e55fc701..d0d0a8180d 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentGrid.php
@@ -18,11 +18,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\ItemActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_payment')]
-final class PaymentGrid extends AbstractGrid implements PaymentGridInterface
+final class PaymentGrid implements PaymentGridInterface
 {
     public function __construct(
         private readonly string $paymentClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php
index 2bb2b5f6e2..588cf0b773 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentMethodGrid.php
@@ -23,11 +23,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_payment_method')]
-final class PaymentMethodGrid extends AbstractGrid implements PaymentMethodGridInterface
+final class PaymentMethodGrid implements PaymentMethodGridInterface
 {
     public function __construct(
         private readonly string $paymentMethodClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php
index 59229c8dd1..24de399243 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PaymentRequestGrid.php
@@ -20,12 +20,11 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 use Sylius\Component\Payment\Model\PaymentRequestInterface;
 
 #[AsGrid(name: 'sylius_admin_payment_request')]
-final class PaymentRequestGrid extends AbstractGrid implements PaymentRequestGridInterface
+final class PaymentRequestGrid implements PaymentRequestGridInterface
 {
     public function __construct(
         private readonly string $paymentRequestClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php
index faa31fcd09..605ddcdf6f 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAssociationTypeGrid.php
@@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product_association_type')]
-final class ProductAssociationTypeGrid extends AbstractGrid implements ProductAssociationTypeGridInterface
+final class ProductAssociationTypeGrid implements ProductAssociationTypeGridInterface
 {
     public function __construct(
         private readonly string $productAssociationTypeClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php
index 030c24d5bc..3ddf9a93d1 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductAttributeGrid.php
@@ -24,7 +24,6 @@ use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Attribute\AttributeType\CheckboxAttributeType;
 use Sylius\Component\Attribute\AttributeType\DateAttributeType;
 use Sylius\Component\Attribute\AttributeType\DatetimeAttributeType;
@@ -37,7 +36,7 @@ use Sylius\Component\Attribute\AttributeType\TextAttributeType;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product_attribute')]
-final class ProductAttributeGrid extends AbstractGrid implements ProductAttributeGridInterface
+final class ProductAttributeGrid implements ProductAttributeGridInterface
 {
     public function __construct(
         private readonly string $productAttributeClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php
index c2320b0899..f61ecac7d9 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductGrid.php
@@ -26,11 +26,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product')]
-final class ProductGrid extends AbstractGrid implements ProductGridInterface
+final class ProductGrid implements ProductGridInterface
 {
     public function __construct(
         private readonly string $productClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php
index 1276e06783..6229388aa3 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductOptionGrid.php
@@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product_option')]
-final class ProductOptionGrid extends AbstractGrid implements ProductOptionGridInterface
+final class ProductOptionGrid implements ProductOptionGridInterface
 {
     public function __construct(
         private readonly string $productOptionClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php
index 4ea1500ed3..425eae6d61 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductReviewGrid.php
@@ -23,11 +23,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product_review')]
-final class ProductReviewGrid extends AbstractGrid implements ProductReviewGridInterface
+final class ProductReviewGrid implements ProductReviewGridInterface
 {
     public function __construct(
         private readonly string $productReviewClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php
index c5d7456c6b..29cdde414e 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductTaxonGrid.php
@@ -24,11 +24,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\BooleanFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product_taxon')]
-final class ProductTaxonGrid extends AbstractGrid implements ProductTaxonGridInterface
+final class ProductTaxonGrid implements ProductTaxonGridInterface
 {
     public function __construct(
         private readonly string $productTaxonClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php
index bdd500b8da..3baab4bfac 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantGrid.php
@@ -25,11 +25,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product_variant')]
-final class ProductVariantGrid extends AbstractGrid implements ProductVariantGridInterface
+final class ProductVariantGrid implements ProductVariantGridInterface
 {
     public function __construct(
         private readonly string $productVariantClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php
index 21d805650b..cae046cf03 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ProductVariantWithCatalogPromotionGrid.php
@@ -21,11 +21,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_product_variant_with_catalog_promotion')]
-final class ProductVariantWithCatalogPromotionGrid extends AbstractGrid implements ProductVariantWithCatalogPromotionGridInterface
+final class ProductVariantWithCatalogPromotionGrid implements ProductVariantWithCatalogPromotionGridInterface
 {
     public function __construct(
         private readonly string $productVariantClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php
index 4a270394de..d3a622448a 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionCouponGrid.php
@@ -25,11 +25,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_promotion_coupon')]
-final class PromotionCouponGrid extends AbstractGrid implements PromotionCouponGridInterface
+final class PromotionCouponGrid implements PromotionCouponGridInterface
 {
     public function __construct(
         private readonly string $promotionCouponClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php
index 9ddc73b7fe..aa3afc05aa 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/PromotionGrid.php
@@ -26,11 +26,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\ExistsFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_promotion')]
-final class PromotionGrid extends AbstractGrid implements PromotionGridInterface
+final class PromotionGrid implements PromotionGridInterface
 {
     public function __construct(
         private readonly string $promotionClass,
@@ -107,7 +106,9 @@ final class PromotionGrid extends AbstractGrid implements PromotionGridInterface
             )
             ->addFilter(
                 ExistsFilter::create('archival', 'archivedAt')
-                    ->setLabel('sylius.ui.archival'),
+                    ->setLabel('sylius.ui.archival')
+                    ->setDefaultValue(false)
+                ,
             )
 
             // -- Actions
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php
index 63950aab54..f9d304ae75 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ShipmentGrid.php
@@ -20,11 +20,10 @@ use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\SelectFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_shipment')]
-final class ShipmentGrid extends AbstractGrid implements ShipmentGridInterface
+final class ShipmentGrid implements ShipmentGridInterface
 {
     public function __construct(
         private readonly string $shipmentClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php
index a05deb87f8..1539b201a5 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingCategoryGrid.php
@@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_shipping_category')]
-final class ShippingCategoryGrid extends AbstractGrid implements ShippingCategoryGridInterface
+final class ShippingCategoryGrid implements ShippingCategoryGridInterface
 {
     public function __construct(
         private readonly string $shippingCategoryClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php
index b875bd9861..7e551d580b 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ShippingMethodGrid.php
@@ -26,11 +26,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\ExistsFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_shipping_method')]
-final class ShippingMethodGrid extends AbstractGrid implements ShippingMethodGridInterface
+final class ShippingMethodGrid implements ShippingMethodGridInterface
 {
     public function __construct(
         private readonly string $shippingMethodClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php
index b83efae922..7f78ec5977 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxCategoryGrid.php
@@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_tax_category')]
-final class TaxCategoryGrid extends AbstractGrid implements TaxCategoryGridInterface
+final class TaxCategoryGrid implements TaxCategoryGridInterface
 {
     public function __construct(
         private readonly string $taxCategoryClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php
index fa64c3290d..19f58ea6ba 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxRateGrid.php
@@ -25,11 +25,10 @@ use Sylius\Bundle\GridBundle\Builder\Filter\DateFilter;
 use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_tax_rate')]
-final class TaxRateGrid extends AbstractGrid implements TaxRateGridInterface
+final class TaxRateGrid implements TaxRateGridInterface
 {
     public function __construct(
         private readonly string $taxRateClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php
index 9154ceb7d5..eb90f846b9 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/TaxonGrid.php
@@ -6,11 +6,10 @@ namespace Sylius\Bundle\AdminBundle\Grid;
 
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_taxon')]
-final class TaxonGrid extends AbstractGrid implements TaxonGridInterface
+final class TaxonGrid implements TaxonGridInterface
 {
     public function __construct(
         private readonly string $taxonClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php
index 502e54b0bd..65b7800d12 100644
--- a/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php
+++ b/src/Sylius/Bundle/AdminBundle/Grid/ZoneGrid.php
@@ -22,11 +22,10 @@ use Sylius\Bundle\GridBundle\Builder\ActionGroup\MainActionGroup;
 use Sylius\Bundle\GridBundle\Builder\Field\TwigField;
 use Sylius\Bundle\GridBundle\Builder\Filter\StringFilter;
 use Sylius\Bundle\GridBundle\Builder\GridBuilderInterface;
-use Sylius\Bundle\GridBundle\Grid\AbstractGrid;
 use Sylius\Component\Grid\Attribute\AsGrid;
 
 #[AsGrid(name: 'sylius_admin_zone')]
-final class ZoneGrid extends AbstractGrid implements ZoneGridInterface
+final class ZoneGrid implements ZoneGridInterface
 {
     public function __construct(
         private readonly string $resourceClass,
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php b/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php
index cf696a9f4e..a016ab6a2e 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/grid.php
@@ -100,7 +100,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.admin_user.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
 
     $services->alias(AdminUserGridInterface::class, 'sylius_admin.grid.admin_user');
@@ -110,7 +110,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.catalog_promotion.class%',
             '%sylius.model.channel.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(CatalogPromotionGridInterface::class, 'sylius_admin.grid.catalog_promotion');
 
@@ -118,7 +118,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.channel.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ChannelGridInterface::class, 'sylius_admin.grid.channel');
 
@@ -126,7 +126,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.currency.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(CurrencyGridInterface::class, 'sylius_admin.grid.currency');
 
@@ -135,7 +135,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.customer.class%',
             '%sylius.model.customer_group.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(CustomerGridInterface::class, 'sylius_admin.grid.customer');
 
@@ -143,7 +143,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.customer_group.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(CustomerGroupGridInterface::class, 'sylius_admin.grid.customer_group');
 
@@ -151,7 +151,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.locale.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(LocaleGridInterface::class, 'sylius_admin.grid.locale');
 
@@ -160,7 +160,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.product_variant.class%',
             '%sylius.model.product.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(InventoryGridInterface::class, 'sylius_admin.grid.inventory');
 
@@ -168,7 +168,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.payment_method.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(PaymentMethodGridInterface::class, 'sylius_admin.grid.payment_method');
 
@@ -176,7 +176,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.product_association_type.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductAssociationTypeGridInterface::class, 'sylius_admin.grid.product_association_type');
 
@@ -184,7 +184,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.taxon.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(TaxonGridInterface::class, 'sylius_admin.grid.taxon');
 
@@ -193,7 +193,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.product_taxon.class%',
             '%sylius.model.channel.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductTaxonGridInterface::class, 'sylius_admin.grid.product_taxon');
 
@@ -203,7 +203,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.channel.class%',
             '%sylius.model.taxon.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductGridInterface::class, 'sylius_admin.grid.product');
 
@@ -211,7 +211,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.product_attribute.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductAttributeGridInterface::class, 'sylius_admin.grid.product_attribute');
 
@@ -219,7 +219,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.product_variant.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductVariantGridInterface::class, 'sylius_admin.grid.product_variant');
 
@@ -228,7 +228,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.product_variant.class%',
             '%locale%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductVariantWithCatalogPromotionGridInterface::class, 'sylius_admin.grid.product_variant_with_catalog_promotion');
 
@@ -236,7 +236,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.country.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(CountryGridInterface::class, 'sylius_admin.grid.country');
 
@@ -246,7 +246,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.channel.class%',
             '%sylius.model.shipping_method.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ShipmentGridInterface::class, 'sylius_admin.grid.shipment');
 
@@ -254,7 +254,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.shipping_category.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ShippingCategoryGridInterface::class, 'sylius_admin.grid.shipping_category');
 
@@ -262,7 +262,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.shipping_method.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ShippingMethodGridInterface::class, 'sylius_admin.grid.shipping_method');
 
@@ -270,7 +270,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.tax_category.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(TaxCategoryGridInterface::class, 'sylius_admin.grid.tax_category');
 
@@ -278,7 +278,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.tax_rate.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(TaxRateGridInterface::class, 'sylius_admin.grid.tax_rate');
 
@@ -286,7 +286,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.promotion_coupon.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(PromotionCouponGridInterface::class, 'sylius_admin.grid.promotion_coupon');
 
@@ -294,7 +294,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.promotion.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(PromotionGridInterface::class, 'sylius_admin.grid.promotion');
 
@@ -302,7 +302,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.zone.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
 
     $services->alias(ZoneGridInterface::class, 'sylius_admin.grid.zone');
@@ -312,7 +312,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.payment.class%',
             '%sylius.model.channel.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(PaymentGridInterface::class, 'sylius_admin.grid.payment');
 
@@ -320,7 +320,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.order.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(CustomerOrderGridInterface::class, 'sylius_admin.grid.customer_order');
 
@@ -333,7 +333,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.product_variant.class%',
             '%sylius.model.shipping_method.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
 
     $services->alias(OrderGridInterface::class, 'sylius_admin.grid.order');
@@ -343,7 +343,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.exchange_rate.class%',
             '%sylius.model.currency.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ExchangeRateGridInterface::class, 'sylius_admin.grid.exchange_rate');
 
@@ -351,7 +351,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.product_option.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductOptionGridInterface::class, 'sylius_admin.grid.product_option');
 
@@ -360,7 +360,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.product_review.class%',
             '%sylius.model.product.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ProductReviewGridInterface::class, 'sylius_admin.grid.product_review');
 
@@ -368,7 +368,7 @@ return static function (ContainerConfigurator $container) {
         ->args([
             '%sylius.model.channel_pricing_log_entry.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
     $services->alias(ChannelPricingLogEntryGridInterface::class, 'sylius_admin.grid.channel_pricing_log_entry');
 
@@ -377,7 +377,7 @@ return static function (ContainerConfigurator $container) {
             '%sylius.model.payment_request.class%',
             '%sylius.model.payment_method.class%',
         ])
-        ->tag('sylius.grid')
+        ->tag('sylius.invokable_grid')
     ;
 
     $services->alias(PaymentRequestGridInterface::class, 'sylius_admin.grid.payment_request');
diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json
index c1728d049f..ba377279e1 100644
--- a/src/Sylius/Bundle/CoreBundle/composer.json
+++ b/src/Sylius/Bundle/CoreBundle/composer.json
@@ -42,7 +42,7 @@
         "sylius/currency-bundle": "^2.0",
         "sylius/customer-bundle": "^2.0",
         "sylius/fixtures-bundle": "^1.9",
-        "sylius/grid-bundle": "^1.14",
+        "sylius/grid-bundle": "^1.16@alpha",
         "sylius/inventory-bundle": "^2.0",
         "sylius/locale-bundle": "^2.0",
         "sylius/mailer-bundle": "^2.1",
diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json
index 71419f4b41..f80e677f6e 100644
--- a/src/Sylius/Bundle/UiBundle/composer.json
+++ b/src/Sylius/Bundle/UiBundle/composer.json
@@ -33,7 +33,7 @@
         "knplabs/knp-menu": "^3.5",
         "knplabs/knp-menu-bundle": "^3.4",
         "laminas/laminas-stdlib": "^3.19",
-        "sylius/grid-bundle": "^1.14",
+        "sylius/grid-bundle": "^1.16@alpha",
         "sylius/twig-extra": "^0.9",
         "symfony/config": "^6.4 || ^7.4",
         "symfony/expression-language": "^6.4 || ^7.4",
diff --git a/symfony.lock b/symfony.lock
index 0a3cbc8c75..3d4ee3158d 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -52,18 +52,6 @@
     "dmore/chrome-mink-driver": {
         "version": "2.7.0"
     },
-    "doctrine/annotations": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "a2759dd6123694c8d901d0ec80006e044c2e6457"
-        },
-        "files": [
-            "config/routes/annotations.yaml"
-        ]
-    },
     "doctrine/cache": {
         "version": "1.10.2"
     },
@@ -197,12 +185,6 @@
     "instaclick/php-webdriver": {
         "version": "1.4.7"
     },
-    "knplabs/gaufrette": {
-        "version": "v0.8.3"
-    },
-    "knplabs/knp-gaufrette-bundle": {
-        "version": "v0.7.1"
-    },
     "knplabs/knp-menu": {
         "version": "v3.1.2"
     },