diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 7abf2cc15..6a64bb6fc 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -3261,29 +3261,30 @@
     'tags'  : ["flang", "runtime"],
     'workernames' : ["as-builder-7"],
     'builddir': "flang-runtime-cuda-gcc",
-    'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
-                    depends_on_projects=["llvm","clang","mlir","flang","flang-rt"],
-                    clean=True,
-                    checks=[],
-                    targets=["flang-rt"],
-                    extra_configure_args=[
-                        "-DCMAKE_BUILD_TYPE=Release",
-                        "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
-                        "-DLLVM_ENABLE_ASSERTIONS=ON",
-                        "-DBUILD_SHARED_LIBS=OFF",
-                        "-DFLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT=CUDA",
-                        "-DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc",
-                        "-DCMAKE_CXX_COMPILER=/usr/bin/g++",
-                        "-DCMAKE_C_COMPILER=/usr/bin/gcc",
-                        "-DCMAKE_CUDA_HOST_COMPILER=/usr/bin/g++",
-                        "-DCMAKE_CUDA_ARCHITECTURES=80",
-                        "-DCMAKE_CUDA_FLAGS=-G -g",
-                        "-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache",
-                        "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
-                        "-DCMAKE_C_COMPILER_LAUNCHER=ccache",
-                        util.Interpolate("-DFLANG_RT_LIBCUDACXX_PATH=%(prop:nv_cccl_root_path)s/libcudacxx"),
-                    ],
-                    env={
+    'factory' : UnifiedTreeBuilder.getCmakeExBuildFactory(
+                    depends_on_projects = ["llvm", "clang", "mlir", "flang", "flang-rt"],
+                    clean = True,
+                    checks = [],
+                    targets = ["flang-rt"],
+                    cmake_definitions = {
+                        "CMAKE_BUILD_TYPE"              : "Release",
+                        "CMAKE_EXPORT_COMPILE_COMMANDS" : "ON",
+                        "LLVM_ENABLE_ASSERTIONS"        : "ON",
+                        "BUILD_SHARED_LIBS"             : "OFF",
+                        "FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT" : "CUDA",
+                        "CMAKE_CUDA_COMPILER"           : "/usr/local/cuda/bin/nvcc",
+                        "CMAKE_CXX_COMPILER"            : "/usr/bin/g++",
+                        "CMAKE_C_COMPILER"              : "/usr/bin/gcc",
+                        "CMAKE_CUDA_HOST_COMPILER"      : "/usr/bin/g++",
+                        "CMAKE_CUDA_ARCHITECTURES"      : "80",
+                        "CMAKE_CUDA_FLAGS"              : "-G -g",
+                        "CMAKE_CUDA_COMPILER_LAUNCHER"  : "ccache",
+                        "CMAKE_CXX_COMPILER_LAUNCHER"   : "ccache",
+                        "CMAKE_C_COMPILER_LAUNCHER"     : "ccache",
+                        "FLANG_RT_LIBCUDACXX_PATH"      : util.Interpolate("%(prop:nv_cccl_root_path)s/libcudacxx"),
+                    },
+                    jobs = 64,
+                    env = {
                         'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
                         # TMP/TEMP within the build dir (to utilize a ramdisk).
                         'TMP'        : util.Interpolate("%(prop:builddir)s/build"),
@@ -3328,6 +3329,7 @@
                             src_to_build_dir = "runtimes",
                         ),
                     ],
+                    jobs = 64,
                     env = {
                         # TMP/TEMP within the build dir (to utilize a ramdisk).
                         'TMP'        : util.Interpolate("%(prop:builddir)s/%(prop:objrootdir)s"),
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
index 1b7bca054..8008856e8 100644
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -243,7 +243,7 @@ def get_all():
                         'jobs': 128,
                         'nv_cccl_root_path'     : '/home/buildbot/worker/third-party/nv/cccl',
                      },
-                     max_builds=2),
+                     max_builds=1),
         # Windows Server on Intel Xeon 6330 CPU 2Sx64Cx128LP @ 2.0GHz, 256GB RAM
         create_worker("as-builder-8", properties={'jobs': 128}, max_builds=1),