diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index a1ebbf14b..a877d3f2c 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -296,6 +296,7 @@
                     checkout_flang=True,
                     checkout_lld=True,
                     extra_cmake_args=[
+                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
                         "-DCLANG_DEFAULT_LINKER=lld",
                         "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
                         "-DCOMPILER_RT_BUILD_SANITIZERS=OFF",
@@ -572,15 +573,21 @@
     'builddir': "clang-arm64-windows-msvc-2stage",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     vs="manual",
-                    clean=False,
+                    clean=True,
                     useTwoStage=True,
-                    checkout_flang=True,
                     testStage1=False,
                     extra_cmake_args=[
+                        "-DLLVM_TARGETS_TO_BUILD=AArch64",
                         "-DCLANG_DEFAULT_LINKER=lld",
                         "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
                         "-DCMAKE_C_COMPILER_LAUNCHER=ccache",
                         "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
+                        "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"],
+                    extra_stage2_cmake_args=[
+                        "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64;X86'",
+                        "-DLLVM_ENABLE_PROJECTS=flang;mlir",
+                        "-DCLANG_DEFAULT_LINKER=lld",
+                        "-DCMAKE_TRY_COMPILE_CONFIGURATION=Release",
                         "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"])},
 
     {'name' : 'clang-x64-windows-msvc',