diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index 73e3b87e14..c1722fd180 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -188,11 +188,13 @@ services:
         # This command is shared by the clone and build stages, make sure to update both stages.
         - j2 "${TUGBOAT_ROOT}/.web/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.web/403-error-document.html"
         - j2 "${TUGBOAT_ROOT}/.storybook/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.storybook/403-error-document.html"
+        - j2 "${TUGBOAT_ROOT}/.next/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.next/403-error-document.html"
         - composer install
         - bash -lc 'nvm install'
         - bash -lc 'npm install'
         - bash -lc 'composer va:theme:compile'
         - bash -lc 'composer va:web:install'
+        - bash -lc 'composer va:next:install'
         # https://www.drush.org/latest/deploycommand/ (updatedb, cache:rebuild, config:import, deploy:hook)
         - drush deploy
 
@@ -216,7 +218,7 @@ services:
         # This command is shared by the clone and build stages, make sure to update both stages.
         - j2 "${TUGBOAT_ROOT}/.web/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.web/403-error-document.html"
         - j2 "${TUGBOAT_ROOT}/.storybook/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.storybook/403-error-document.html"
-
+        - j2 "${TUGBOAT_ROOT}/.next/403-error-document.j2.html" -o "${TUGBOAT_ROOT}/.next/403-error-document.html"
       online:
         # We only want tests running on PRs, not branches like the base preview build of main.
         - if [ "$TUGBOAT_PREVIEW_TYPE" = "pullrequest" ]; then bash -lc 'time task --taskfile=tests.yml'; fi
diff --git a/composer.json b/composer.json
index e8a48fdf59..8664b2efe4 100644
--- a/composer.json
+++ b/composer.json
@@ -819,10 +819,15 @@
             "! ./scripts/should-run-directly.sh || ./scripts/web-prepare-dotenv.sh",
             "./scripts/should-run-directly.sh || ddev composer va:web:prepare-dotenv --"
         ],
-        "va:next-preview": [
-            "# Prepare the next preview server",
-			"! ./scripts/should-run-directly.sh || ./scripts/next-preview.sh",
-            "./scripts/should-run-directly.sh || ddev composer va:next-preview --"
+		"va:next:install": [
+            "# Prepare the next build project",
+			"! ./scripts/should-run-directly.sh || ./scripts/next-install.sh",
+            "./scripts/should-run-directly.sh || ddev composer va:next-install --"
+        ]
+        "va:next:build": [
+            "# Prepare the next build server",
+			"! ./scripts/should-run-directly.sh || ./scripts/next-build.sh",
+            "./scripts/should-run-directly.sh || ddev composer va:next-build --"
         ]
     }
 }
diff --git a/scripts/next-preview.sh b/scripts/next-build.sh
similarity index 100%
rename from scripts/next-preview.sh
rename to scripts/next-build.sh
diff --git a/scripts/next-install.sh b/scripts/next-install.sh
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tugboat.yml b/tugboat.yml
index d3030f5b14..4eabc1c565 100644
--- a/tugboat.yml
+++ b/tugboat.yml
@@ -16,7 +16,7 @@ tasks:
   build-next:
     desc: build next.js preview server
     cmds:
-      - composer va:next-preview
+      - composer va:next:build
 
   build:
     deps: