diff --git a/.ddev/config.selenium-standalone-chrome.yaml b/.ddev/config.selenium-standalone-chrome.yaml
deleted file mode 100644
index 61e40f9..0000000
--- a/.ddev/config.selenium-standalone-chrome.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#ddev-generated
-# Remove the line above if you don't want this file to be overwritten when you run
-# ddev get ddev/ddev-selenium-standalone-chrome
-#
-# This file comes from https://github.com/ddev/ddev-selenium-standalone-chrome
-#
-web_environment:
-  - BROWSERTEST_OUTPUT_DIRECTORY=/tmp
-  - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_PRIMARY_URL}
-  - SIMPLETEST_BASE_URL=http://web
-  - SIMPLETEST_DB=mysql://db:db@db/db
-  # 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\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"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_PATH_PREFIX=/wd/hub
-  - DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=--disable-gpu --headless --no-sandbox --disable-dev-shm-usage
-  - 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\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
diff --git a/.ddev/docker-compose.chromedriver.yaml b/.ddev/docker-compose.chromedriver.yaml
new file mode 100644
index 0000000..b9b9b57
--- /dev/null
+++ b/.ddev/docker-compose.chromedriver.yaml
@@ -0,0 +1,45 @@
+# Docker-ChromeDriver configuration for DDEV-Local.
+# There is one item that must be configured in this file in order for it to
+# work, please see below.
+
+services:
+  chromedriver:
+    image:  drupalci/webdriver-chromedriver:production
+    container_name: ddev-${DDEV_SITENAME}-chromedriver
+    labels:
+      com.ddev.site-name: ${DDEV_SITENAME}
+      com.ddev.approot: $DDEV_APPROOT
+    external_links:
+      - ddev-router:${DDEV_SITENAME}.${DDEV_TLD}
+
+  web:
+    links:
+      - chromedriver
+    environment:
+      # *** One of these must be uncommented ***
+      # In order for the system to work, one of these must be uncommented so
+      # that the test system can connect to the database.
+      # - SIMPLETEST_DB=sqlite://tmp/test.sqlite
+      # - SIMPLETEST_DB=mysql://db:db@db/db
+      #
+      # Note: Do not modify the base URL value.
+      - SIMPLETEST_BASE_URL=http://web
+      - BROWSERTEST_OUTPUT_DIRECTORY=/tmp
+      - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_PRIMARY_URL}
+      - MINK_DRIVER_ARGS_WEBDRIVER=["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://chromedriver:9515"]
+      # Additional
+      - SIMPLETEST_BASE_URL=http://web
+      - SIMPLETEST_DB=mysql://db:db@db/db
+      - 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_PATH_PREFIX=/wd/hub
+      - DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=--disable-gpu --headless --no-sandbox --disable-dev-shm-usage
+      - 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\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
diff --git a/.ddev/docker-compose.selenium-chrome.yaml b/.ddev/docker-compose.selenium-chrome.yaml
deleted file mode 100644
index c126da8..0000000
--- a/.ddev/docker-compose.selenium-chrome.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#ddev-generated
-# Remove the line above if you don't want this file to be overwritten when you run
-# ddev get ddev/ddev-selenium-standalone-chrome
-#
-# This file comes from https://github.com/ddev/ddev-selenium-standalone-chrome
-#
-version: '3.6'
-services:
-  selenium-chrome:
-    image: seleniarm/standalone-chromium:4.1.4-20220429
-    container_name: ddev-${DDEV_SITENAME}-selenium-chrome
-    expose:
-      #      The internal noVNC port, which operates over HTTP so it can be exposed
-      #      through the router.
-      - 7900
-    environment:
-      - VIRTUAL_HOST=$DDEV_HOSTNAME
-      - HTTPS_EXPOSE=7900:7900
-      - HTTP_EXPOSE=7910:7900
-    external_links:
-      - ddev-router:${DDEV_SITENAME}.${DDEV_TLD}
-    # To enable VNC access for traditional VNC clients like macOS "Screen Sharing",
-    # uncomment the following two lines.
-    #ports:
-    #  - "5900:5900"
-    labels:
-      com.ddev.site-name: ${DDEV_SITENAME}
-      com.ddev.approot: $DDEV_APPROOT
-    volumes:
-      - ".:/mnt/ddev_config"
-
-  web:
-    links:
-      - selenium-chrome