diff --git a/README.md b/README.md
index fc5f89b..4b25429 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,6 @@ You may optionally specify size of browser window in the screenshot step:
 ### Local development setup
 
 ```bash
-cp docker-compose.override.default.yml docker-compose.override.yml
 docker compose up -d
 docker compose exec phpserver composer install --ansi
 ```
diff --git a/behat.yml b/behat.yml
index 29e3ff4..1f23ca8 100644
--- a/behat.yml
+++ b/behat.yml
@@ -27,10 +27,22 @@ default:
       files_path: "%paths.base%/tests/behat/features/fixtures"
       browser_name: chrome
       base_url: http://phpserver:8888
+      javascript_session: selenium2
       selenium2:
         wd_host: "http://chrome:4444/wd/hub"
-        capabilities: { "browser": "chrome", "version": "*", "marionette": true }
-      javascript_session: selenium2
+        capabilities:
+          browser: chrome
+          extra_capabilities:
+            "goog:chromeOptions":
+              args:
+                - '--disable-gpu'            # Disables hardware acceleration required in containers and cloud-based instances (like CI runners) where GPU is not available.
+                # Options to increase stability and speed.
+                - '--disable-extensions'     # Disables all installed Chrome extensions. Useful in testing environments to avoid interference from extensions.
+                - '--disable-infobars'       # Hides the infobar that Chrome displays for various notifications, like warnings when opening multiple tabs.
+                - '--disable-popup-blocking' # Disables the popup blocker, allowing all popups to appear. Useful in testing scenarios where popups are expected.
+                - '--disable-translate'      # Disables the built-in translation feature, preventing Chrome from offering to translate pages.
+                - '--no-first-run'           # Skips the initial setup screen that Chrome typically shows when running for the first time.
+                - '--test-type'              # Disables certain security features and UI components that are unnecessary for automated testing, making Chrome more suitable for test environments.
     DrevOps\BehatScreenshotExtension:
       dir: '%paths.base%/.logs/screenshots'
       fail: true
diff --git a/composer.json b/composer.json
index 893c8de..816c79f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,13 +21,14 @@
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",
         "behat/mink-browserkit-driver": "^2.2",
-        "behat/mink-selenium2-driver": "^1.7",
         "dealerdirect/phpcodesniffer-composer-installer": "^1",
         "drevops/behat-phpserver": "^1.2",
         "drupal/coder": "^8.3",
         "dvdoug/behat-code-coverage": "^5.3",
         "ergebnis/composer-normalize": "^2.44",
         "escapestudios/symfony2-coding-standard": "^3",
+        "lullabot/mink-selenium2-driver": "^1.7",
+        "lullabot/php-webdriver": "^2.0.4",
         "mikey179/vfsstream": "^1.6",
         "opis/closure": "^3.6",
         "phpmd/phpmd": "^2.13",
diff --git a/docker-compose.override.default.yml b/docker-compose.override.default.yml
deleted file mode 100644
index acc276a..0000000
--- a/docker-compose.override.default.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
-  chrome:
-    # Chrome image with Apple M1 support.
-    image: seleniarm/standalone-chromium:111.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e5a7ef..922b8b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,4 +7,4 @@ services:
       # To enable xdebug: XDEBUG_ENABLE=true docker compose up -d phpserver
       XDEBUG_ENABLE: ${XDEBUG_ENABLE:-}
   chrome:
-    image: selenium/standalone-chrome:111.0
+    image: selenium/standalone-chromium:130.0