diff --git a/composer.json b/composer.json
index d017cf1..aca676d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,10 +30,10 @@
     ],
     "require": {
         "composer/installers": "^1.9",
-        "drupal/core-composer-scaffold": "*",
-        "drupal/drupal": "*",
         "drupal/core": "*",
+        "drupal/core-composer-scaffold": "*",
         "drupal/core-dev": "*",
+        "drupal/drupal": "*",
         "drush/drush": "^10.3.6 || ^11.x-dev",
         "phpspec/prophecy-phpunit": "*",
         "symfony/var-dumper": "^4.4 | ^5.1"
@@ -41,7 +41,13 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "drupal/core-vendor-hardening": true,
+            "drupal/core-project-message": true,
+            "drupal/core-composer-scaffold": true
+        }
     },
     "scripts": {
         "post-root-package-install": [
@@ -60,6 +66,10 @@
         "drupal-scaffold": {
             "locations": {
                 "web-root": "web/"
+            },
+            "file-mapping": {
+                "[web-root]/index.php": "scaffold/web/index.php",
+                "[web-root]/update.php": "scaffold/web/update.php"
             }
         },
         "installer-paths": {
diff --git a/scaffold/web/index.php b/scaffold/web/index.php
new file mode 100644
index 0000000..5b6c8a0
--- /dev/null
+++ b/scaffold/web/index.php
@@ -0,0 +1,3 @@
+<?php
+
+chdir(__DIR__ . '/../repos/drupal') && include __DIR__ . '/../repos/drupal/index.php';
diff --git a/scaffold/web/update.php b/scaffold/web/update.php
new file mode 100644
index 0000000..c396d75
--- /dev/null
+++ b/scaffold/web/update.php
@@ -0,0 +1,3 @@
+<?php
+
+chdir(__DIR__ . '/../repos/drupal') && include __DIR__ . '/../repos/drupal/update.php';
diff --git a/src/ComposerScripts.php b/src/ComposerScripts.php
index 2057b55..2a26992 100644
--- a/src/ComposerScripts.php
+++ b/src/ComposerScripts.php
@@ -50,8 +50,6 @@ public static function postDrupalScaffold() {
     // See https://www.drupal.org/project/drupal/issues/3188703
     // See https://www.drupal.org/project/drupal/issues/1792310
     chdir('web');
-    shell_exec('patch -p1 <../scaffold/scaffold-patch-index-php.patch');
-    shell_exec('patch -p1 <../scaffold/scaffold-patch-update-php.patch');
 
     // Symlink the top-level vendor folder into the Drupal core git repo.
     chdir('..');
@@ -64,9 +62,9 @@ public static function postDrupalScaffold() {
     if (!file_exists('web/sites/simpletest/browser_output')) {
       mkdir('web/sites/simpletest/browser_output', 0777, TRUE);
     }
-
     // Symlink the simpletest folder into the Drupal core git repo.
     static::makeSymlink('../../../web/sites/simpletest', 'repos/drupal/sites/simpletest');
+    static::makeSymlink( '../../../repos/drupal/sites/default/files', 'web/sites/default/files');
   }
 
   /**