diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 6f25b76..f21a669 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1477,6 +1477,7 @@
                             "-DCMAKE_C_COMPILER=/usr/bin/gcc-9",
                             "-DCMAKE_CXX_COMPILER=/usr/bin/g++-9",
                             "-DLLVM_INSTALL_UTILS=ON",
+                            "-DFLANG_BUILD_NEW_DRIVER=ON",
                             "-DCMAKE_CXX_STANDARD=17",
                         ],
          ),
@@ -1490,14 +1491,15 @@
                         depends_on_projects=['llvm','mlir','clang','flang'],
                         extra_configure_args=[
                             "-DLLVM_TARGETS_TO_BUILD=AArch64",
-                            "-DCMAKE_C_COMPILER=/usr/local/bin/clang",
-                            "-DCMAKE_CXX_COMPILER=/usr/local/bin/clang++",
+                            "-DCMAKE_C_COMPILER=/usr/bin/clang-10",
+                            "-DCMAKE_CXX_COMPILER=/usr/bin/clang++-10",
                             "-DLLVM_INSTALL_UTILS=ON",
                             "-DCMAKE_CXX_STANDARD=17",
                             "-DLLVM_ENABLE_WERROR=ON",
                             "-DBUILD_SHARED_LIBS=ON",
                             "-DLLVM_ENABLE_ASSERTIONS=ON",
                             "-DLLVM_ENABLE_LIBCXX=On",
+                            "-DFLANG_BUILD_NEW_DRIVER=ON",
                             "-DCMAKE_BUILD_TYPE=Release",
                         ],
          ),
@@ -1511,14 +1513,15 @@
                         depends_on_projects=['llvm','mlir','clang','flang'],
                         extra_configure_args=[
                             "-DLLVM_TARGETS_TO_BUILD=AArch64",
-                            "-DCMAKE_C_COMPILER=/usr/local/bin/gcc-10",
-                            "-DCMAKE_CXX_COMPILER=/usr/local/bin/g++-10",
+                            "-DCMAKE_C_COMPILER=/usr/bin/gcc-10",
+                            "-DCMAKE_CXX_COMPILER=/usr/bin/g++-10",
                             "-DLLVM_INSTALL_UTILS=ON",
                             "-DCMAKE_CXX_STANDARD=17",
                             "-DLLVM_ENABLE_WERROR=OFF",
-                            "-DFLANG_ENABLE_WERROR=ON"
+                            "-DFLANG_ENABLE_WERROR=ON",
                             "-DBUILD_SHARED_LIBS=ON",
                             "-DLLVM_ENABLE_ASSERTIONS=ON",
+                            "-DFLANG_BUILD_NEW_DRIVER=ON",
                             "-DCMAKE_BUILD_TYPE=Release",
                         ],
          ),
diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py
index ba99fa6..ff62a0f 100644
--- a/buildbot/osuosl/master/config/status.py
+++ b/buildbot/osuosl/master/config/status.py
@@ -278,7 +278,8 @@
         InformativeMailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
-            extraRecipients = ["caroline.concatto@arm.com"],
+            extraRecipients = [
+                "caroline.concatto@arm.com", "flang_llvm_buildbots@arm.com"],
             subject="Build %(builder)s Failure",
             mode = "failing",
             builders = [