diff --git a/commerce_quantity_increments.info.yml b/commerce_quantity_increments.info.yml
index 8b70ceb..8b2a2ab 100644
--- a/commerce_quantity_increments.info.yml
+++ b/commerce_quantity_increments.info.yml
@@ -1,7 +1,7 @@
 name: 'Commerce Quantity Increments'
 type: module
 description: 'Provides possibility to set and validate quantity increments on a per product variation level.'
-core_version_requirement: ^10 || ^11
+core_version_requirement: ^10.1 || ^11 || ^12
 package: 'Commerce (contrib)'
 
 dependencies:
diff --git a/commerce_quantity_increments.module b/commerce_quantity_increments.module
index 73f9b88..a5fca2d 100644
--- a/commerce_quantity_increments.module
+++ b/commerce_quantity_increments.module
@@ -4,7 +4,8 @@
  * @file
  * Provides quantity increments for commerce product variation entities.
  */
-
+use Drupal\Core\Hook\Attribute\LegacyHook;
+use Drupal\commerce_quantity_increments\Hook\CommerceQuantityIncrementsHooks;
 use Drupal\commerce_product\Entity\ProductVariationInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -13,54 +14,18 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Implements hook_entity_base_field_info().
  */
-function commerce_quantity_increments_entity_base_field_info(EntityTypeInterface $entity_type) {
-  $fields = [];
-  if ($entity_type->id() === 'commerce_product_variation') {
-    $fields['qty_increments'] = BaseFieldDefinition::create('decimal')
-      ->setLabel(t('Quantity increments'))
-      ->setDescription(t('The allowed quantity increments.'))
-      ->setRequired(FALSE)
-      ->setTranslatable(FALSE)
-      ->setSettings([
-        'unsigned' => TRUE,
-        'size' => 'normal',
-        'min' => 0,
-      ])
-      ->setDefaultValue(1)
-      ->setDisplayOptions('form', [
-        'type' => 'number',
-        'weight' => 10,
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE);
-  }
-  return $fields;
+#[LegacyHook]
+function commerce_quantity_increments_entity_base_field_info(EntityTypeInterface $entity_type)
+{
+    return \Drupal::service(CommerceQuantityIncrementsHooks::class)->entityBaseFieldInfo($entity_type);
 }
 
 /**
  * Implements hook_form_BASE_FORM_ID_alter() for \Drupal\commerce_cart\Form\AddToCartForm.
  */
+#[LegacyHook]
 function commerce_quantity_increments_form_commerce_order_item_add_to_cart_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  if (isset($form['quantity']['widget'][0]['value'])) {
-    if ($selected_variation = $form_state->get('selected_variation')) {
-      $product_variation = \Drupal::entityTypeManager()->getStorage('commerce_product_variation')->load($selected_variation);
-    }
-    else {
-      /** @var \Drupal\commerce_cart\Form\AddToCartForm $form_object */
-      $form_object = $form_state->getFormObject();
-      /** @var \Drupal\commerce_order\Entity\OrderItemInterface $order_item */
-      $order_item = $form_object->getEntity();
-      $product_variation = $order_item->getPurchasedEntity();
-    }
-
-    if ($product_variation instanceof ProductVariationInterface && $qty_increments = commerce_quantity_increments_get_increments_from_product_variation($product_variation)) {
-      $form_state->set('commerce_quantity_increments_active_variation', $product_variation->id());
-      $form['quantity']['widget'][0]['value']['#element_validate'][] = 'commerce_quantity_increments_add_to_cart_form_validate_qty_increments';
-      $form['quantity']['widget'][0]['value']['#default_value'] = $qty_increments;
-      $form['quantity']['widget'][0]['value']['#min'] = $qty_increments;
-      $form['quantity']['widget'][0]['value']['#step'] = $qty_increments;
-    }
-  }
+  \Drupal::service(CommerceQuantityIncrementsHooks::class)->formCommerceOrderItemAddToCartFormAlter($form, $form_state, $form_id);
 }
 
 /**
@@ -82,23 +47,10 @@ function commerce_quantity_increments_add_to_cart_form_validate_qty_increments(a
 /**
  * Implements hook_form_BASE_FORM_ID_alter() for views_form_commerce_cart_form_default.
  */
-function commerce_quantity_increments_form_views_form_commerce_cart_form_default_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  $view = reset($form_state->getBuildInfo()['args']);
-  if (!empty($view->result) && !empty($form['edit_quantity'])) {
-    foreach ($view->result as $row) {
-      /** @var \Drupal\commerce_order\Entity\OrderItemInterface $order_item */
-      $order_item = $row->_relationship_entities['order_items'];
-      $product_variation = $order_item->getPurchasedEntity();
-      if ($product_variation instanceof ProductVariationInterface && $qty_increments = commerce_quantity_increments_get_increments_from_product_variation($product_variation)) {
-        $form['edit_quantity'][$row->index]['#element_validate'][] = 'commerce_quantity_increments_commerce_cart_form_validate_qty_increments';
-        $form['edit_quantity'][$row->index]['#min'] = $qty_increments;
-        $form['edit_quantity'][$row->index]['#step'] = $qty_increments;
-        if (!is_int($qty_increments)) {
-          $form['edit_quantity'][$row->index]['#default_value'] = $order_item->getQuantity();
-        }
-      }
-    }
-  }
+#[LegacyHook]
+function commerce_quantity_increments_form_views_form_commerce_cart_form_default_alter(array &$form, FormStateInterface $form_state, $form_id)
+{
+    \Drupal::service(CommerceQuantityIncrementsHooks::class)->formViewsFormCommerceCartFormDefaultAlter($form, $form_state, $form_id);
 }
 
 /**
diff --git a/commerce_quantity_increments.services.yml b/commerce_quantity_increments.services.yml
new file mode 100644
index 0000000..9dd6f74
--- /dev/null
+++ b/commerce_quantity_increments.services.yml
@@ -0,0 +1,5 @@
+
+services:
+  Drupal\commerce_quantity_increments\Hook\CommerceQuantityIncrementsHooks:
+    class: Drupal\commerce_quantity_increments\Hook\CommerceQuantityIncrementsHooks
+    autowire: true
diff --git a/composer.json b/composer.json
index 219390d..b5d2ab3 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "license": "GPL-2.0-or-later",
     "require": {
         "drupal/commerce": "^2.29 || ^3",
-        "drupal/core": "^10 || ^11"
+        "drupal/core": "^10.1 || ^11 || ^12"
     },
     "minimum-stability": "dev"
 }
diff --git a/src/Hook/CommerceQuantityIncrementsHooks.php b/src/Hook/CommerceQuantityIncrementsHooks.php
new file mode 100644
index 0000000..df3869f
--- /dev/null
+++ b/src/Hook/CommerceQuantityIncrementsHooks.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Drupal\commerce_quantity_increments\Hook;
+
+use Drupal\commerce_product\Entity\ProductVariationInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Hook\Attribute\Hook;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+/**
+ * Hook implementations for commerce_quantity_increments.
+ */
+class CommerceQuantityIncrementsHooks
+{
+    use StringTranslationTrait;
+    /**
+     * Implements hook_entity_base_field_info().
+     */
+    #[Hook('entity_base_field_info')]
+    public function entityBaseFieldInfo(\Drupal\Core\Entity\EntityTypeInterface $entity_type)
+    {
+        $fields = [
+        ];
+        if ($entity_type->id() === 'commerce_product_variation') {
+            $fields['qty_increments'] = \Drupal\Core\Field\BaseFieldDefinition::create('decimal')->setLabel($this->t('Quantity increments'))->setDescription($this->t('The allowed quantity increments.'))->setRequired(FALSE)->setTranslatable(FALSE)->setSettings([
+                'unsigned' => TRUE,
+                'size' => 'normal',
+                'min' => 0,
+            ])->setDefaultValue(1)->setDisplayOptions('form', [
+                'type' => 'number',
+                'weight' => 10,
+            ])->setDisplayConfigurable('form', TRUE)->setDisplayConfigurable('view', TRUE);
+        }
+        return $fields;
+    }
+    /**
+     * Implements hook_form_BASE_FORM_ID_alter() for \Drupal\commerce_cart\Form\AddToCartForm.
+     */
+    #[Hook('form_commerce_order_item_add_to_cart_form_alter')]
+    public static function formCommerceOrderItemAddToCartFormAlter(array &$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id)
+    {
+        if (isset($form['quantity']['widget'][0]['value'])) {
+            if ($selected_variation = $form_state->get('selected_variation')) {
+                $product_variation = \Drupal::entityTypeManager()->getStorage('commerce_product_variation')->load($selected_variation);
+            } else {
+                /** @var \Drupal\commerce_cart\Form\AddToCartForm $form_object */
+                $form_object = $form_state->getFormObject();
+                /** @var \Drupal\commerce_order\Entity\OrderItemInterface $order_item */
+                $order_item = $form_object->getEntity();
+                $product_variation = $order_item->getPurchasedEntity();
+            }
+            if ($product_variation instanceof \Drupal\commerce_product\Entity\ProductVariationInterface && $qty_increments = commerce_quantity_increments_get_increments_from_product_variation($product_variation)) {
+                $form_state->set('commerce_quantity_increments_active_variation', $product_variation->id());
+                $form['quantity']['widget'][0]['value']['#element_validate'][] = 'commerce_quantity_increments_add_to_cart_form_validate_qty_increments';
+                $form['quantity']['widget'][0]['value']['#default_value'] = $qty_increments;
+                $form['quantity']['widget'][0]['value']['#min'] = $qty_increments;
+                $form['quantity']['widget'][0]['value']['#step'] = $qty_increments;
+            }
+        }
+    }
+    /**
+     * Implements hook_form_BASE_FORM_ID_alter() for views_form_commerce_cart_form_default.
+     */
+    #[Hook('form_views_form_commerce_cart_form_default_alter')]
+    public static function formViewsFormCommerceCartFormDefaultAlter(array &$form, \Drupal\Core\Form\FormStateInterface $form_state, $form_id)
+    {
+        $view = reset($form_state->getBuildInfo()['args']);
+        if (!empty($view->result) && !empty($form['edit_quantity'])) {
+            foreach ($view->result as $row) {
+                /** @var \Drupal\commerce_order\Entity\OrderItemInterface $order_item */
+                $order_item = $row->_relationship_entities['order_items'];
+                $product_variation = $order_item->getPurchasedEntity();
+                if ($product_variation instanceof \Drupal\commerce_product\Entity\ProductVariationInterface && $qty_increments = commerce_quantity_increments_get_increments_from_product_variation($product_variation)) {
+                    $form['edit_quantity'][$row->index]['#element_validate'][] = 'commerce_quantity_increments_commerce_cart_form_validate_qty_increments';
+                    $form['edit_quantity'][$row->index]['#min'] = $qty_increments;
+                    $form['edit_quantity'][$row->index]['#step'] = $qty_increments;
+                    if (!is_int($qty_increments)) {
+                        $form['edit_quantity'][$row->index]['#default_value'] = $order_item->getQuantity();
+                    }
+                }
+            }
+        }
+    }
+}
