diff --git a/composer.json b/composer.json
index 68e0fce..a8dd2f7 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,10 @@
     "require": {
         "php": ">=7.0",
         "composer/installers": "^1.2",
-        "oomphinc/composer-installers-extender": "^1.1",
         "cweagans/composer-patches": "^1.6.5",
-        "drupal-composer/drupal-scaffold": "^2.6",
-        "behat/mink-selenium2-driver": "1.4.x-dev as 1.3.x-dev",
-        "wikimedia/composer-merge-plugin": "^1.4",
-        "dennisdigital/polaris": "^3.0"
+        "dennisdigital/polaris": "dev-CMS-1773-composer-2",
+        "drupal/core-composer-scaffold": "^9.1",
+        "wikimedia/composer-merge-plugin": "^2.0.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -40,30 +38,29 @@
         ],
         "files": ["load.environment.php"]
     },
-    "scripts": {
-        "drupal-scaffold": "DrupalComposer\\DrupalScaffold\\Plugin::scaffold",
-        "pre-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "pre-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "post-install-cmd": [
-            "@drupal-scaffold",
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ],
-        "post-update-cmd": [
-            "@drupal-scaffold",
-            "DrupalProject\\composer\\ScriptHandler::createRequiredFiles",
-            "echo # drush cim -y",
-            "echo # drush updb -y",
-            "echo # drush cex -y",
-            "echo # git status"
-        ]
-    },
     "extra": {
         "composer-exit-on-patch-failure": true,
         "installer-types": ["bower-asset"],
+        "locations": {
+            "web-root": "web/"
+        },
+        "file-mapping": {
+            "[web-root]/.csslintrc": "assets/.csslintrc",
+            "[web-root]/.editorconfig": "assets/.editorconfig",
+            "[web-root]/.eslintignore": "assets/.eslintignore",
+            "[web-root]/.eslintrc.json": "assets/.eslintrc.json",
+            "[web-root]/.gitattributes": "assets/.gitattributes",
+            "[web-root]/.ht.router.php": "assets/.ht.router.php",
+            "[web-root]/.htaccess": "assets/.htaccess",
+            "[web-root]/sites/default/default.services.yml": "assets/default.services.yml",
+            "[web-root]/sites/default/default.settings.php": "assets/default.settings.php",
+            "[web-root]/sites/example.settings.local.php": "assets/example.settings.local.php",
+            "[web-root]/sites/example.sites.php": "assets/example.sites.php",
+            "[web-root]/index.php": "assets/index.php",
+            "[web-root]/robots.txt": "assets/robots.txt",
+            "[web-root]/update.php": "assets/update.php",
+            "[web-root]/web.config": "assets/web.config"
+        },
         "installer-paths": {
             "web/core": ["type:drupal-core"],
             "web/libraries/{$name}": [