diff --git a/spec/Behat/MinkExtension/Listener/SessionsListenerSpec.php b/spec/Behat/MinkExtension/Listener/SessionsListenerSpec.php
index 07bf4dd..1f84a21 100644
--- a/spec/Behat/MinkExtension/Listener/SessionsListenerSpec.php
+++ b/spec/Behat/MinkExtension/Listener/SessionsListenerSpec.php
@@ -15,7 +15,7 @@ class SessionsListenerSpec extends ObjectBehavior
 {
     public function let(Mink $mink, ScenarioTested $event, FeatureNode $feature, ScenarioNode $scenario, Suite $suite)
     {
-        $this->beConstructedWith($mink, 'goutte', 'selenium2', ['selenium2', 'sahi']);
+        $this->beConstructedWith($mink, 'browserkit_http', 'selenium2', ['selenium2', 'sahi']);
 
         $event->getSuite()->willReturn($suite);
         $event->getFeature()->willReturn($feature);
@@ -38,7 +38,7 @@ class SessionsListenerSpec extends ObjectBehavior
     public function it_resets_the_default_session_before_scenarios($event, $mink)
     {
         $mink->resetSessions()->shouldBeCalled();
-        $mink->setDefaultSessionName('goutte')->shouldBeCalled();
+        $mink->setDefaultSessionName('browserkit_http')->shouldBeCalled();
 
         $this->prepareDefaultMinkSession($event);
     }
@@ -120,7 +120,7 @@ class SessionsListenerSpec extends ObjectBehavior
     public function it_fails_when_the_javascript_session_is_used_but_not_defined($event, $mink, $feature, $suite)
     {
         $suite->hasSetting('mink_javascript_session')->willReturn(false);
-        $this->beConstructedWith($mink, 'goutte', null);
+        $this->beConstructedWith($mink, 'browserkit_http', null);
         $feature->getTags()->willReturn(['javascript']);
 
         $this->shouldThrow(new ProcessingException('The @javascript tag cannot be used without enabling a javascript session'))
@@ -151,7 +151,7 @@ class SessionsListenerSpec extends ObjectBehavior
     {
         $scenario->hasTag('insulated')->willReturn(true);
         $mink->stopSessions()->shouldBeCalled();
-        $mink->setDefaultSessionName('goutte')->shouldBeCalled();
+        $mink->setDefaultSessionName('browserkit_http')->shouldBeCalled();
 
         $this->prepareDefaultMinkSession($event);
     }
@@ -160,7 +160,7 @@ class SessionsListenerSpec extends ObjectBehavior
     {
         $feature->hasTag('insulated')->willReturn(true);
         $mink->stopSessions()->shouldBeCalled();
-        $mink->setDefaultSessionName('goutte')->shouldBeCalled();
+        $mink->setDefaultSessionName('browserkit_http')->shouldBeCalled();
 
         $this->prepareDefaultMinkSession($event);
     }
diff --git a/src/Behat/MinkExtension/Context/Initializer/MinkAwareInitializer.php b/src/Behat/MinkExtension/Context/Initializer/MinkAwareInitializer.php
index d9bc814..10f6b8a 100644
--- a/src/Behat/MinkExtension/Context/Initializer/MinkAwareInitializer.php
+++ b/src/Behat/MinkExtension/Context/Initializer/MinkAwareInitializer.php
@@ -23,9 +23,11 @@ use Behat\MinkExtension\Context\MinkAwareContext;
  */
 class MinkAwareInitializer implements ContextInitializer
 {
+    /**
+     * @param array<string, mixed> $parameters
+     */
     public function __construct(
         private readonly Mink $mink,
-        /** @var array<string, mixed> */
         private readonly array $parameters,
     ) {
     }
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/AppiumFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/AppiumFactory.php
index ba2fd87..3c4a7fb 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/AppiumFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/AppiumFactory.php
@@ -25,7 +25,7 @@ class AppiumFactory extends Selenium2Factory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserKitFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserKitFactory.php
index 118d3b0..d150c47 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserKitFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserKitFactory.php
@@ -41,7 +41,7 @@ class BrowserKitFactory implements DriverFactory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserStackFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserStackFactory.php
index 862e298..784cf48 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserStackFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/BrowserStackFactory.php
@@ -33,7 +33,7 @@ class BrowserStackFactory extends Selenium2Factory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/DriverFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/DriverFactory.php
index 08a142a..c3c756e 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/DriverFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/DriverFactory.php
@@ -25,7 +25,7 @@ interface DriverFactory
     public function configure(ArrayNodeDefinition $builder): void;
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition;
 }
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/SahiFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/SahiFactory.php
index ce5f5e6..c6f5f28 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/SahiFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/SahiFactory.php
@@ -39,7 +39,7 @@ class SahiFactory implements DriverFactory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/SauceLabsFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/SauceLabsFactory.php
index 18c3f72..cf32c66 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/SauceLabsFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/SauceLabsFactory.php
@@ -34,7 +34,7 @@ class SauceLabsFactory extends Selenium2Factory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php
index 563a007..8b6bd7a 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium2Factory.php
@@ -39,7 +39,7 @@ class Selenium2Factory implements DriverFactory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
@@ -47,9 +47,7 @@ class Selenium2Factory implements DriverFactory
             throw new \RuntimeException(sprintf('Install MinkSelenium2Driver in order to use %s driver.', $this->getDriverName()));
         }
 
-        /** @var array<string, mixed> $capabilities */
         $capabilities = is_array($config['capabilities']) ? $config['capabilities'] : [];
-        /** @var array<string, mixed> $extraCapabilities */
         $extraCapabilities = is_array($capabilities['extra_capabilities']) ? $capabilities['extra_capabilities'] : [];
         unset($capabilities['extra_capabilities']);
 
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium4Factory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium4Factory.php
index cceb7d3..427a6c1 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium4Factory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/Selenium4Factory.php
@@ -40,7 +40,7 @@ class Selenium4Factory implements DriverFactory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/SeleniumFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/SeleniumFactory.php
index 4e2d2cf..d466005 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/SeleniumFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/SeleniumFactory.php
@@ -37,7 +37,7 @@ class SeleniumFactory implements DriverFactory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/WebdriverClassicFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/WebdriverClassicFactory.php
index 8b9c335..49eeb42 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/WebdriverClassicFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/WebdriverClassicFactory.php
@@ -34,6 +34,9 @@ class WebdriverClassicFactory implements DriverFactory
             ->end();
     }
 
+    /**
+     * @param array<mixed> $config
+     */
     public function buildDriver(array $config): Definition
     {
         if (!class_exists(WebdriverClassicDriver::class)) {
diff --git a/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php b/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php
index cfbf8c7..1c061d5 100644
--- a/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php
+++ b/src/Behat/MinkExtension/ServiceContainer/Driver/ZombieFactory.php
@@ -40,7 +40,7 @@ class ZombieFactory implements DriverFactory
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     public function buildDriver(array $config): Definition
     {
diff --git a/src/Behat/MinkExtension/ServiceContainer/MinkExtension.php b/src/Behat/MinkExtension/ServiceContainer/MinkExtension.php
index af4355e..fff8d2d 100644
--- a/src/Behat/MinkExtension/ServiceContainer/MinkExtension.php
+++ b/src/Behat/MinkExtension/ServiceContainer/MinkExtension.php
@@ -124,13 +124,12 @@ class MinkExtension implements ExtensionInterface
                         if (!array_key_exists($driverType, $v)) {
                             continue;
                         }
-                        /** @var array<string, array<string, mixed>> $sessions */
                         $sessions = is_array($v['sessions']) ? $v['sessions'] : [];
                         if (isset($sessions[$driverType])) {
                             continue;
                         }
 
-                        $sessions[$driverType][$driverType] = $v[$driverType];
+                        $sessions[$driverType] = [$driverType => $v[$driverType]];
                         $v['sessions'] = $sessions;
                         unset($v[$driverType]);
                     }
@@ -223,28 +222,25 @@ class MinkExtension implements ExtensionInterface
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<mixed> $config
      */
     private function loadSessions(ContainerBuilder $container, array $config): void
     {
-        /** @var string|null $defaultSession */
         $defaultSession = is_string($config['default_session']) ? $config['default_session'] : null;
-        /** @var string|null $javascriptSession */
         $javascriptSession = is_string($config['javascript_session']) ? $config['javascript_session'] : null;
-        /** @var string[] $javascriptSessions */
         $javascriptSessions = [];
-        /** @var string[] $nonJavascriptSessions */
         $nonJavascriptSessions = [];
 
         $minkDefinition = $container->getDefinition(self::MINK_ID);
 
-        /** @var array<string, array<string, mixed>> $sessions */
         $sessions = is_array($config['sessions']) ? $config['sessions'] : [];
         foreach ($sessions as $name => $session) {
+            if (!is_array($session)) {
+                continue;
+            }
             $driver = (string) key($session);
             $factory = $this->driverFactories[$driver];
 
-            /** @var array<string, mixed> $driverConfig */
             $driverConfig = is_array($session[$driver]) ? $session[$driver] : [];
             $definition = new Definition('Behat\Mink\Session', [
                 $factory->buildDriver($driverConfig),