diff --git a/commerce_google_tag_manager.info.yml b/commerce_google_tag_manager.info.yml
index 72cb6f0..664f1a3 100644
--- a/commerce_google_tag_manager.info.yml
+++ b/commerce_google_tag_manager.info.yml
@@ -1,7 +1,7 @@
 name: 'Enhanced Ecommerce for Google Tag Manager'
 description: 'Provides Commerce integration for Enhanced Ecommerce events via Google Tag Manager'
 package: 'Commerce (contrib)'
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^8.8 || ^9 || ^10
 type: module
 dependencies:
   - drupal:google_tag
diff --git a/composer.json b/composer.json
index 488f53d..14e77a5 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
   "prefer-stable": true,
   "require": {
     "drupal/commerce": "^2.8",
-    "drupal/google_tag": "^1.1"
+    "drupal/google_tag": "^2.0"
   },
   "require-dev": {
     "drupal/coder": "^8.3.1"
diff --git a/src/Event/AlterEventDataEvent.php b/src/Event/AlterEventDataEvent.php
index 3bb302d..2285d88 100644
--- a/src/Event/AlterEventDataEvent.php
+++ b/src/Event/AlterEventDataEvent.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\commerce_google_tag_manager\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Drupal\Component\EventDispatcher\Event;
 
 /**
  * Event to alter Enhanced Ecommerce event data.
diff --git a/src/Event/AlterProductEvent.php b/src/Event/AlterProductEvent.php
index c8b4988..6c62341 100644
--- a/src/Event/AlterProductEvent.php
+++ b/src/Event/AlterProductEvent.php
@@ -4,7 +4,7 @@ namespace Drupal\commerce_google_tag_manager\Event;
 
 use Drupal\commerce_google_tag_manager\Product;
 use Drupal\commerce_product\Entity\ProductVariationInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Drupal\Component\EventDispatcher\Event;
 
 /**
  * Event to alter the Enhanced Ecommerce product.
diff --git a/src/Event/AlterProductPurchasedEntityEvent.php b/src/Event/AlterProductPurchasedEntityEvent.php
index c994a43..54b933f 100644
--- a/src/Event/AlterProductPurchasedEntityEvent.php
+++ b/src/Event/AlterProductPurchasedEntityEvent.php
@@ -5,7 +5,7 @@ namespace Drupal\commerce_google_tag_manager\Event;
 use Drupal\commerce\PurchasableEntityInterface;
 use Drupal\commerce_google_tag_manager\Product;
 use Drupal\commerce_order\Entity\OrderItemInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Drupal\Component\EventDispatcher\Event;
 
 /**
  * Event to alter the Enhanced Ecommerce product.
diff --git a/src/Event/TrackCheckoutStepEvent.php b/src/Event/TrackCheckoutStepEvent.php
index c2d00da..e16dfe3 100644
--- a/src/Event/TrackCheckoutStepEvent.php
+++ b/src/Event/TrackCheckoutStepEvent.php
@@ -3,7 +3,7 @@
 namespace Drupal\commerce_google_tag_manager\Event;
 
 use Drupal\commerce_order\Entity\OrderInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Drupal\Component\EventDispatcher\Event;
 
 /**
  * Event dispatched when a checkout step is tracked.
diff --git a/src/EventStorageService.php b/src/EventStorageService.php
index dee0750..070014a 100644
--- a/src/EventStorageService.php
+++ b/src/EventStorageService.php
@@ -72,7 +72,7 @@ class EventStorageService {
 
     if (!isset($events[$hash])) {
       $event = new AlterEventDataEvent($event_data);
-      $this->eventDispatcher->dispatch(EnhancedEcommerceEvents::ALTER_EVENT_DATA, $event);
+      $this->eventDispatcher->dispatch($event, EnhancedEcommerceEvents::ALTER_EVENT_DATA);
       $events[$this->hash($event_data)] = $event->getEventData();
       $this->tempStore->set('events', $events);
     }
diff --git a/src/EventSubscriber/CommerceEventsSubscriber.php b/src/EventSubscriber/CommerceEventsSubscriber.php
index c90dd96..4895606 100644
--- a/src/EventSubscriber/CommerceEventsSubscriber.php
+++ b/src/EventSubscriber/CommerceEventsSubscriber.php
@@ -10,7 +10,7 @@ use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\state_machine\Event\WorkflowTransitionEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 
 /**
  * Event handler for commerce related events.
@@ -75,7 +75,7 @@ class CommerceEventsSubscriber implements EventSubscriberInterface {
    * @param \Symfony\Component\HttpKernel\Event\GetResponseEvent $event
    *   The event to view the product.
    */
-  public function trackProductView(GetResponseEvent $event) {
+  public function trackProductView(RequestEvent $event) {
     $product = $this->routeMatch->getParameter('commerce_product');
     if ($event->getRequest()->getMethod() === 'GET' && !empty($product) && $this->routeMatch->getRouteName() === 'entity.commerce_product.canonical') {
       $default_variation = $product->getDefaultVariation();
diff --git a/src/EventSubscriber/KernelEventsSubscriber.php b/src/EventSubscriber/KernelEventsSubscriber.php
index 70e8908..6261fab 100644
--- a/src/EventSubscriber/KernelEventsSubscriber.php
+++ b/src/EventSubscriber/KernelEventsSubscriber.php
@@ -101,7 +101,7 @@ class KernelEventsSubscriber implements EventSubscriberInterface {
     }
 
     // Bail if we are not dealing with a master request or GET method.
-    if (!$event->isMasterRequest() || !$event->getRequest()->isMethod('GET')) {
+    if (!$event->isMainRequest() || !$event->getRequest()->isMethod('GET')) {
       return FALSE;
     }
 
diff --git a/src/EventTrackerService.php b/src/EventTrackerService.php
index 4689f8f..feebc3f 100644
--- a/src/EventTrackerService.php
+++ b/src/EventTrackerService.php
@@ -238,7 +238,7 @@ class EventTrackerService {
 
     // Throw an event to add possible checkout step options by event listeners.
     $event = new TrackCheckoutStepEvent($step_index, $order);
-    $this->eventDispatcher->dispatch(EnhancedEcommerceEvents::TRACK_CHECKOUT_STEP, $event);
+    $this->eventDispatcher->dispatch($event, EnhancedEcommerceEvents::TRACK_CHECKOUT_STEP);
   }
 
   /**
@@ -318,7 +318,7 @@ class EventTrackerService {
         ->setPrice(self::formatPrice((float) $order_item->getTotalPrice()->getNumber()));
 
       $event = new AlterProductPurchasedEntityEvent($product, $order_item, $purchased_entity);
-      $this->eventDispatcher->dispatch(EnhancedEcommerceEvents::ALTER_PRODUCT_PURCHASED_ENTITY, $event);
+      $this->eventDispatcher->dispatch($event, EnhancedEcommerceEvents::ALTER_PRODUCT_PURCHASED_ENTITY);
     }
 
     return $product;
@@ -350,7 +350,7 @@ class EventTrackerService {
     }
 
     $event = new AlterProductEvent($product, $product_variation);
-    $this->eventDispatcher->dispatch(EnhancedEcommerceEvents::ALTER_PRODUCT, $event);
+    $this->eventDispatcher->dispatch($event, EnhancedEcommerceEvents::ALTER_PRODUCT);
 
     return $product;
   }
diff --git a/tests/src/Kernel/EventSubscriber/CartEventTest.php b/tests/src/Kernel/EventSubscriber/CartEventTest.php
index 0642277..b122984 100644
--- a/tests/src/Kernel/EventSubscriber/CartEventTest.php
+++ b/tests/src/Kernel/EventSubscriber/CartEventTest.php
@@ -8,7 +8,7 @@ use Drupal\commerce_price\Price;
 use Drupal\commerce_product\Entity\ProductVariation;
 use Drupal\commerce_cart\Event\CartEntityAddEvent;
 use Drupal\commerce_cart\Event\CartOrderItemRemoveEvent;
-use Drupal\Tests\commerce_cart\Traits\CartManagerTestTrait;
+use Drupal\Tests\commerce_cart\Kernel\CartKernelTestBase;
 use Drupal\Tests\commerce_google_tag_manager\Traits\DeprecationSuppressionTrait;
 
 /**
@@ -19,7 +19,7 @@ use Drupal\Tests\commerce_google_tag_manager\Traits\DeprecationSuppressionTrait;
  * @group commerce_google_tag_manager_kernel
  */
 class CartEventTest extends CommerceKernelTestBase {
-  use CartManagerTestTrait;
+  use CartKernelTestBase;
   use DeprecationSuppressionTrait;
 
   /**