diff --git a/swift-build-presets b/swift-build-presets
index ecd889d..bca8930 100644
--- a/swift-build-presets
+++ b/swift-build-presets
@@ -1,10 +1,7 @@
-[preset: codeql]
-release
-build-subdir=codeql
-
+[preset: codeql-baseline]
 bootstrapping=off
-llvm-targets-to-build=X86;ARM;AArch64
-llvm-cmake-options=-DLLVM_ENABLE_TERMINFO=OFF
+
+llvm-cmake-options=-DLLVM_ENABLE_TERMINFO=OFF -DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64
 
 skip-ios
 skip-tvos
@@ -28,36 +25,16 @@ skip-test-swift
 skip-build-clang-tools-extra
 skip-build-benchmarks
 skip-build-android
+enable-experimental-string-processing
+swift-enable-experimental-string-processing=1
+
+[preset: codeql]
+mixin-preset=codeql-baseline
+release
+build-subdir=codeql
 
 [preset: codeql-debug]
+mixin-preset=codeql-baseline
 debug
-assertions
 build-subdir=codeql-debug
 
-bootstrapping=off
-llvm-targets-to-build=X86;ARM;AArch64
-llvm-cmake-options=-DLLVM_ENABLE_TERMINFO=OFF
-
-skip-ios
-skip-tvos
-skip-watchos
-
-skip-test-osx
-skip-test-linux
-skip-test-swiftpm
-skip-test-swift-driver
-skip-test-swiftsyntax
-skip-test-indexstore-db
-skip-test-sourcekit-lsp
-skip-test-playgroundsupport
-skip-test-skstresstester
-skip-test-swiftformat
-skip-test-swiftevolve
-skip-test-toolchain-benchmarks
-skip-test-swift-inspect
-skip-test-swift
-
-skip-build-clang-tools-extra
-skip-build-benchmarks
-skip-build-android
-