diff --git a/composer.json b/composer.json
index aafcec7c..aeaa392c 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
     "require": {
         "composer-runtime-api": "^2.2.2",
         "cweagans/composer-patches": "^1.7",
+        "dmore/behat-chrome-extension": "^1.4",
         "drupal/coder": "^8.3.6",
         "drush/drush": ">=9",
         "mglaman/drupal-check": "^1.2",
diff --git a/defaults/install/behat.yml b/defaults/install/behat.yml
index b62d602f..5201596a 100644
--- a/defaults/install/behat.yml
+++ b/defaults/install/behat.yml
@@ -12,11 +12,13 @@ default:
   gherkin:
     cache: ~
   extensions:
-    Behat\MinkExtension:
+    DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
+    Drupal\MinkExtension:
       goutte: ~
-      selenium2:
-        wd_host: "http://127.0.0.1:8643/wd/hub"
-      javascript_session: selenium2
+      chrome:
+        api_url: "http://chrome:9222"
+      browser_name: chrome
+      javascript_session: chrome
       base_url: ${drupal.sites.default.uri}
     Drupal\DrupalExtension:
       blackbox: ~
@@ -32,5 +34,7 @@ default:
 
 circleci:
   extensions:
-    Behat\MinkExtension:
+    Drupal\MinkExtension:
+      chrome:
+        api_url: "http://localhost:9222"
       base_url: ${drupal.sites.default.uri}:8000
diff --git a/targets/install.xml b/targets/install.xml
index e4b3782b..ad9be0d8 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -142,11 +142,15 @@
                 <!-- The one that's available is the location we're moving from. -->
                 <available file="${build.dir}/web/core" type="dir" property="drupal.root.old" value="web" />
                 <available file="${build.dir}/docroot/core" type="dir" property="drupal.root.old" value="docroot" />
-                <available file="${build.dir}/${drupal.root.old}/sites/default/settings.ddev.php" type="file" property="ddev_settings_exists" value="true" />
+                <available file="${build.dir}/${drupal.root}/sites/default/settings.ddev.php" type="file" property="ddev_settings_exists" value="true" />
+                <available file="${build.dir}/${drupal.root.old}/sites/default/settings.ddev.php" type="file" property="old_ddev_settings_exists" value="true" />
 
                 <!-- Copy settings.ddev.php if it doesn't exist in the old drupal root. -->
                 <if>
-                    <not><equals arg1="${ddev_settings_exists}" arg2="1" /></not>
+                    <and>
+                      <equals arg1="${ddev_settings_exists}" arg2="1" />
+                      <not><equals arg1="${old_ddev_settings_exists}" arg2="1" /></not>
+                    </and>
                     <then>
                         <echo msg="Copying settings.ddev.php to old drupal root." />
                         <exec command="cp ${drupal.root}/sites/default/settings.ddev.php ${drupal.root.old}/sites/default" dir="${build.dir}" checkreturn="true" logoutput="true" />