diff --git a/.ddev/.env b/.ddev/.env
new file mode 100644
index 0000000..e69de29
diff --git a/.ddev/addon-metadata/ddev-selenium-standalone-chrome/manifest.yaml b/.ddev/addon-metadata/ddev-selenium-standalone-chrome/manifest.yaml
index 6a71a7f..db99fcd 100644
--- a/.ddev/addon-metadata/ddev-selenium-standalone-chrome/manifest.yaml
+++ b/.ddev/addon-metadata/ddev-selenium-standalone-chrome/manifest.yaml
@@ -1,9 +1,19 @@
 name: ddev-selenium-standalone-chrome
 repository: ddev/ddev-selenium-standalone-chrome
-version: 1.0.5
-install_date: "2024-07-10T20:32:17+02:00"
+version: 2.0.0-rc2
+install_date: "2025-08-20T11:25:00+02:00"
 project_files:
     - docker-compose.selenium-chrome.yaml
     - config.selenium-standalone-chrome.yaml
 global_files: []
-removal_actions: []
+removal_actions:
+    - |
+      #ddev-nodisplay
+      #ddev-description:Remove docker-compose.selenium-chrome_extras.yaml file
+      if [ -f docker-compose.selenium-chrome_extras.yaml ]; then
+        if grep -q '#ddev-generated' docker-compose.selenium-chrome_extras.yaml; then
+          rm -f docker-compose.selenium-chrome_extras.yaml
+        else
+          echo "Unwilling to remove '$DDEV_APPROOT/.ddev/docker-compose.selenium-chrome_extras.yaml' because it does not have #ddev-generated in it; you can manually delete it if it is safe to delete."
+        fi
+      fi
diff --git a/.ddev/config.selenium-standalone-chrome.yaml b/.ddev/config.selenium-standalone-chrome.yaml
index 7e3b1bc..0577cb6 100644
--- a/.ddev/config.selenium-standalone-chrome.yaml
+++ b/.ddev/config.selenium-standalone-chrome.yaml
@@ -12,17 +12,20 @@ web_environment:
   # Use disable-dev-shm-usage instead of setting shm_usage
   # https://developers.google.com/web/tools/puppeteer/troubleshooting#tips
   # The format of chromeOptions is defined at https://chromedriver.chromium.org/capabilities
-  - MINK_DRIVER_ARGS_WEBDRIVER=[\"chrome\",{\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":true,\"args\":[\"--no-sandbox\",\"--disable-dev-shm-usage\",\"--ignore-certificate-errors\",\"--allow-insecure-localhost\",\"--dns-prefetch-disable\"]}},\"http://selenium-chrome:4444\"]
+  - MINK_DRIVER_ARGS_WEBDRIVER=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":true,\"args\":[\"--disable-dev-shm-usage\",\"--disable-gpu\",\"--dns-prefetch-disable\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
   # Nightwatch
   - DRUPAL_TEST_BASE_URL=http://web
   - DRUPAL_TEST_DB_URL=mysql://db:db@db/db
   - DRUPAL_TEST_WEBDRIVER_HOSTNAME=selenium-chrome
   - DRUPAL_TEST_WEBDRIVER_PORT=4444
-  - DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=--disable-gpu --no-sandbox --disable-dev-shm-usage
+  - DRUPAL_TEST_WEBDRIVER_PATH_PREFIX=/wd/hub
+  - DRUPAL_TEST_WEBDRIVER_W3C=true
+  # --window-size=1920,1080 is needed to fix random timeouts in tests. See: https://community.latenode.com/t/selenium-webdriver-timeout-issue-when-running-in-headless-mode-with-c/21952/4
+  - DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=--disable-dev-shm-usage --disable-gpu --headless --dns-prefetch-disable --window-size=1920,1080
   - DRUPAL_TEST_CHROMEDRIVER_AUTOSTART=false
   - DRUPAL_NIGHTWATCH_SEARCH_DIRECTORY=../
   - DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES=node_modules,vendor,.*,sites/*/files,sites/*/private,sites/simpletest
   - DRUPAL_NIGHTWATCH_OUTPUT=reports/nightwatch
   # DTT
   - DTT_BASE_URL=http://web
-  - DTT_MINK_DRIVER_ARGS=[\"chrome\",{\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":true,\"args\":[\"--no-sandbox\",\"--disable-dev-shm-usage\",\"--ignore-certificate-errors\",\"--allow-insecure-localhost\",\"--dns-prefetch-disable\"]}},\"http://selenium-chrome:4444\"]
+  - DTT_MINK_DRIVER_ARGS=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":true,\"args\":[\"--disable-dev-shm-usage\",\"--disable-gpu\",\"--headless\",\"--dns-prefetch-disable\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
diff --git a/.ddev/docker-compose.selenium-chrome.yaml b/.ddev/docker-compose.selenium-chrome.yaml
index f7cb55c..1a67ffe 100644
--- a/.ddev/docker-compose.selenium-chrome.yaml
+++ b/.ddev/docker-compose.selenium-chrome.yaml
@@ -4,10 +4,9 @@
 #
 # This file comes from https://github.com/ddev/ddev-selenium-standalone-chrome
 #
-version: '3.6'
 services:
   selenium-chrome:
-    image: seleniarm/standalone-chromium:latest
+    image: selenium/standalone-chromium:138.0
     container_name: ddev-${DDEV_SITENAME}-selenium-chrome
     expose:
       #      The internal noVNC port, which operates over HTTP so it can be exposed
@@ -17,8 +16,7 @@ services:
       - VIRTUAL_HOST=$DDEV_HOSTNAME
       - HTTPS_EXPOSE=7900:7900
       - HTTP_EXPOSE=7910:7900
-    external_links:
-      - ddev-router:${DDEV_SITENAME}.${DDEV_TLD}
+      - VNC_NO_PASSWORD=1
     # To enable VNC access for traditional VNC clients like macOS "Screen Sharing",
     # uncomment the following two lines.
     #ports:
@@ -27,6 +25,8 @@ services:
       com.ddev.site-name: ${DDEV_SITENAME}
       com.ddev.approot: $DDEV_APPROOT
     volumes:
+      # To enable file uploads in E2E tests.
+      - ${DDEV_APPROOT}:/var/www/html:r
       - ".:/mnt/ddev_config"
 
   web:
diff --git a/.ddev/docker-compose.selenium-chrome_extras.yaml b/.ddev/docker-compose.selenium-chrome_extras.yaml
new file mode 100644
index 0000000..4b8e233
--- /dev/null
+++ b/.ddev/docker-compose.selenium-chrome_extras.yaml
@@ -0,0 +1,5 @@
+#ddev-generated
+services:
+  selenium-chrome:
+    external_links:
+      - "ddev-router:${DDEV_PROJECT}.${DDEV_TLD}"