diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index cc70ea9b..cd5c990c 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -3182,17 +3182,16 @@
     'workernames' : ["as-builder-7"],
     'builddir': "flang-runtime-cuda-gcc",
     'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
-                    depends_on_projects=["flang"],
+                    depends_on_projects=["llvm","clang","mlir","flang","flang-rt"],
                     clean=True,
                     checks=[],
-                    src_to_build_dir="flang/runtime",
-                    targets=["FortranRuntime"],
+                    targets=["flang-rt"],
                     extra_configure_args=[
                         "-DCMAKE_BUILD_TYPE=Release",
                         "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
                         "-DBUILD_SHARED_LIBS=OFF",
-                        "-DFLANG_EXPERIMENTAL_CUDA_RUNTIME=ON",
+                        "-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",
@@ -3202,7 +3201,7 @@
                         "-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache",
                         "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
                         "-DCMAKE_C_COMPILER_LAUNCHER=ccache",
-                        util.Interpolate("-DFLANG_LIBCUDACXX_PATH=%(prop:nv_cccl_root_path)s/libcudacxx"),
+                        util.Interpolate("-DFLANG_RT_LIBCUDACXX_PATH=%(prop:nv_cccl_root_path)s/libcudacxx"),
                     ],
                     env={
                         'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
@@ -3219,8 +3218,8 @@
                     clean = True,
                     stages = [
                         dict(
-                            name = "clang",
-                            depends_on_projects = ["llvm", "clang", "clang-tools-extra", "lld", "openmp"],
+                            name = "flang",
+                            depends_on_projects = ["llvm", "clang", "flang", "clang-tools-extra", "lld", "openmp"],
                             enable_runtimes = ["compiler-rt"],
                             cmake_definitions = {
                                 "LLVM_CCACHE_BUILD"         : "ON",
@@ -3229,23 +3228,24 @@
                                 "LLVM_TARGETS_TO_BUILD"     : "Native",
                                 "CLANG_DEFAULT_LINKER"      : "lld",
                             },
-                            install_dir = "install-clang",
+                            install_dir = "install-flang",
                             env = {
                                 'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
                             },
                         ),
                         dict(
-                            name = "flang-runtime",
-                            depends_on_projects = ["flang"],
+                            name = "flang-rt",
+                            depends_on_projects = ["flang-rt"],
                             cmake_definitions = {
                                 "CMAKE_BUILD_TYPE"          : "Release",
-                                "CMAKE_C_COMPILER"          : util.Interpolate("%(prop:builddir)s/install-clang/bin/clang"),
-                                "CMAKE_CXX_COMPILER"        : util.Interpolate("%(prop:builddir)s/install-clang/bin/clang++"),
-                                "FLANG_EXPERIMENTAL_OMP_OFFLOAD_BUILD"  : "host_device",
-                                "FLANG_OMP_DEVICE_ARCHITECTURES"        : "sm_50;sm_60;sm_70;sm_80",
+                                "CMAKE_C_COMPILER"          : util.Interpolate("%(prop:builddir)s/install-flang/bin/clang"),
+                                "CMAKE_CXX_COMPILER"        : util.Interpolate("%(prop:builddir)s/install-flang/bin/clang++"),
+                                "CMAKE_Fortran_COMPILER"    : util.Interpolate("%(prop:builddir)s/install-flang/bin/flang"),
+                                "CMAKE_Fortran_COMPILER_WORKS"           : "ON",
+                                "FLANG_RT_EXPERIMENTAL_OFFLOAD_SUPPORT"  : "OpenMP",
+                                "FLANG_RT_OMP_DEVICE_ARCHITECTURES"      : "sm_50;sm_60;sm_70;sm_80",
                             },
-                            targets = ["FortranRuntime"],
-                            src_to_build_dir = "flang/runtime",
+                            src_to_build_dir = "runtimes",
                         ),
                     ],
                     env = {