diff --git a/.docker/Dockerfile.govcms8 b/.docker/Dockerfile.govcms8
index 19576b100..17f556bf8 100644
--- a/.docker/Dockerfile.govcms8
+++ b/.docker/Dockerfile.govcms8
@@ -10,6 +10,9 @@ ARG GITHUB_TOKEN
 
 COPY composer.* /app/
 
+# Copy base file for extensible saas.
+COPY custom /app/custom
+
 # Install yq for YAML parsing.
 RUN wget -O /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64" \
   && chmod +x /usr/local/bin/yq
@@ -27,8 +30,6 @@ ENV COMPOSER_MEMORY_LIMIT=-1
 # Set the Github OAuth token only when the variable is set.
 RUN [[ ! -z "${GITHUB_TOKEN}" ]]  && composer config -g github-oauth.github.com ${GITHUB_TOKEN} || echo "Personal Github OAuth token is not set."
 RUN composer install -d /app \
-    # Force drupal-scaffold to run to ensure that the needed files are always created, even if a composer.lock is provided
-    && composer drupal-scaffold \
     && composer clearcache
 
 COPY .docker/sanitize.sh /app/sanitize.sh
diff --git a/composer.json b/composer.json
index b100ff506..930c0d7bb 100644
--- a/composer.json
+++ b/composer.json
@@ -19,19 +19,22 @@
         {
             "type": "vcs",
             "url": "git@github.com:govCMS/scaffold-tooling.git"
+        },
+        {
+            "type": "path",
+            "url": "custom/composer"
         }
     ],
     "require": {
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6.5",
-        "drupal-composer/drupal-scaffold": "^2.5",
         "govcms/govcms": "^1.0",
+        "govcms/scaffold-tooling": "^2.0",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
-        "drupal/core-recommended": "^8.8",
-        "symfony/event-dispatcher": "4.3.11 as 3.4.41",
         "zaporylie/composer-drupal-optimizations": "^1.0",
-        "govcms/scaffold-tooling": "^2.0"
+        "symfony/event-dispatcher": "4.3.11 as 3.4.41",
+        "govcms/govcms-custom": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5"
@@ -64,9 +67,6 @@
         ],
         "post-update-cmd": [
             "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ],
-        "drupal-scaffold": [
-            "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
         ]
     },
     "extra": {
@@ -74,7 +74,7 @@
             "drupal/core": "-p2"
         },
         "enable-patching": true,
-        "patches": {},
+        "patches-file": "custom/composer/patches.json",
         "installer-types": ["bower-asset", "npm-asset"],
         "installer-paths": {
             "web/core": [
@@ -95,12 +95,6 @@
             "drush/Commands/{$name}": [
                 "type:drupal-drush"
             ]
-        },
-        "drupal-scaffold": {
-            "initial": {
-                ".editorconfig": "../.editorconfig",
-                ".gitattributes": "../.gitattributes"
-            }
         }
     }
 }
diff --git a/custom/composer/composer.json b/custom/composer/composer.json
new file mode 100644
index 000000000..5a6f9d6e3
--- /dev/null
+++ b/custom/composer/composer.json
@@ -0,0 +1,6 @@
+{
+    "name": "govcms/govcms-custom",
+    "description": "Provides additional packages over the GovCMS base distribution.",
+    "require": {
+    }
+}
diff --git a/custom/composer/patches.json b/custom/composer/patches.json
new file mode 100644
index 000000000..b7805831b
--- /dev/null
+++ b/custom/composer/patches.json
@@ -0,0 +1,4 @@
+{
+  "patches": {
+  }
+}