diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28a4da50..1065571d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+- Custom scratch folders moved inside scratch dir. #TINY-14050
+
 ## 16.1.0 - 2026-03-03
 
 ### Changed
diff --git a/modules/server/src/main/ts/BedrockAuto.ts b/modules/server/src/main/ts/BedrockAuto.ts
index 15fe14c8..1d02f814 100644
--- a/modules/server/src/main/ts/BedrockAuto.ts
+++ b/modules/server/src/main/ts/BedrockAuto.ts
@@ -80,7 +80,7 @@ export const go = async (bedrockAutoSettings: BedrockAutoSettings): Promise<void
 
     const driverDeferred = defer<Attempt<unknown, Browser>>();
 
-    const scratchDir = settings.name ? `scratch_${settings.name}` : `bedrock`;
+    const scratchDir = settings.name ? `scratch/${settings.name}` : `scratch/bedrock`;
 
     const routesPromise = RunnerRoutes.generate('auto', settings.projectdir, settings.basedir, scratchDir, settings.config, settings.bundler, settings.testfiles, settings.chunk, settings.retries, settings.singleTimeout, settings.stopOnFailure, basePage, settings.coverage, settings.polyfills);