diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 8a0cdfb5ed757..0fd388392235c 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -3117,15 +3117,9 @@ llvm-cmake-options=
 # Build Requirements:
 #   - C and C++ compiler
 # Toolchain Outputs:
-#   - Swift Compiler
-#     C++ Driver
-#     No Macro Support
-#     No Swift Compiler Sources
+#   - Swift Compiler (-SwiftDriver, -macros, -SwiftSilOpts)
 # Runtime Outputs:
-#   - Swift Standard Library
-#     swiftCore
-#     OnoneSupport
-#     Concurrency
+#   - Swift Standard Library (-macros)
 [preset: bootstrap_stage0]
 mixin-preset=
   mixin_buildbot_linux,no_test
@@ -3138,17 +3132,103 @@ release
 skip-early-swiftsyntax
 skip-early-swift-driver
 skip-build-benchmarks
+build-swift-examples=0
 
 build-runtime-with-host-compiler=0
 build-swift-libexec=0
 build-swift-remote-mirror=0
 
-swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools
-llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;llvm-symbolizer
-
 extra-cmake-options=
   -DLLVM_TARGETS_TO_BUILD=AArch64;X86
 
 swift-cmake-options=
+  -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY:BOOL=YES
+  -DSWIFT_ENABLE_EXPERIMENTAL_OBSERVATION:BOOL=NO
+  -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL=NO
+  -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING:BOOL=NO
   -DSWIFT_ENABLE_SWIFT_IN_SWIFT:BOOL=NO
   -DSWIFT_INCLUDE_DOCS:BOOL=NO
+  -DSWIFT_BUILD_EXAMPLES:BOOL=OFF
+  -DSWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL=NO
+  -DSWIFT_BUILD_STATIC_STDLIB:BOOL=NO
+
+build-subdir=%(build_subdir)s
+install-destdir=%(install_destdir)s
+
+swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools
+llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;llvm-symbolizer
+
+install-llvm
+install-swift
+
+# Build Toolchain Requirements:
+# - C/C++ compiler
+# - Swift Compiler (-SwiftDriver, -macros, -SwiftSilOpts)
+# Toolchain Outputs:
+# - Swift Compiler (-SwiftDriver, +macros, +SwiftSilOpts)
+# Runtime Outputs:
+# - Standard Library (+macros)
+# - Dispatch
+# - Foundation (+macros)
+[preset: bootstrap_stage1]
+mixin-preset=mixin_buildbot_linux,no_test
+bootstrapping=hosttools
+
+release
+foundation
+libdispatch
+
+skip-early-swift-driver
+skip-build-benchmarks
+
+enable-experimental-concurrency=1
+
+extra-cmake-options=
+  -DLLVM_TARGETS_TO_BUILD=AArch64;X86
+
+swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools;license
+llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;lld
+
+build-subdir=%(build_subdir)s
+install-destdir=%(install_destdir)s
+
+install-llvm
+install-swift
+install-foundation
+install-libdispatch
+
+[preset: bootstrap_stage2]
+mixin-presets=mixin_buildbot_linux,no_test
+bootstrapping=hosttools
+
+release
+
+skip-early-swift-driver
+
+llbuild
+xctest
+swiftpm
+
+swift-include-tests=0
+llvm-include-tests=0
+
+
+foundation
+libdispatch
+
+skip-build-benchmarks
+skip-test-cmark
+
+build-subdir=%(build_subdir)s
+install-destdir=%(install_destdir)s
+
+swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;toolchain-tools;license
+llvm-install-components=llvm-ar;llvm-ranlib;clang;clang-resource-headers;compiler-rt;clang-features-file;lld
+
+install-llvm
+install-swift
+install-foundation
+install-libdispatch
+install-llbuild
+install-swiftpm
+install-xctest
diff --git a/utils/build_swift/tests/build_swift/test_presets.py b/utils/build_swift/tests/build_swift/test_presets.py
index 495d8aa99812f..f2041d9c19fa4 100644
--- a/utils/build_swift/tests/build_swift/test_presets.py
+++ b/utils/build_swift/tests/build_swift/test_presets.py
@@ -44,6 +44,7 @@
     'ndk_path': '/path/to/ndk',
     'arm_dir': '/path/to/arm',
     'toolchain_path': '/tmp/toolchain',
+    'build_subdir': 'test_build_subdir',
 }
 
 SAMPLE_PRESET = """