diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1535,13 +1535,41 @@
          'builddir':"flang-aarch64-ubuntu-clang",
          'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
                         clean=True,
+                        jobs=8,
                         depends_on_projects=['llvm','mlir','clang','flang'],
                         extra_configure_args=[
                             "-DLLVM_TARGETS_TO_BUILD=AArch64",
-                            "-DCMAKE_C_COMPILER=/usr/bin/clang-8",
-                            "-DCMAKE_CXX_COMPILER=/usr/bin/clang++-8",
+                            "-DCMAKE_C_COMPILER=/usr/local/clang-10",
+                            "-DCMAKE_CXX_COMPILER=/usr/bin/clang++",
                             "-DLLVM_INSTALL_UTILS=ON",
                             "-DCMAKE_CXX_STANDARD=17",
+                            "-DLLVM_ENABLE_WERROR=ON",
+                            "-DBUILD_SHARED_LIBS=ON",
+                            "-DLLVM_ENABLE_ASSERTIONS=ON",
+                            "-DLLVM_ENABLE_LIBCXX=On",
+                            "-DCMAKE_BUILD_TYPE=Release",
+                        ],
+         ),
+         'category' : 'flang'},
+
+        {'name': "flang-aarch64-ubuntu-gcc10",
+         'slavenames':["flang-aarch64-ubuntu-gcc10-build"],
+         'builddir':"flang-aarch64-ubuntu-gcc10",
+         'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                        clean=True,
+                        jobs=8,
+                        depends_on_projects=['llvm','mlir','clang','flang'],
+                        extra_configure_args=[
+                            "-DLLVM_TARGETS_TO_BUILD=AArch64",
+                            "-DCMAKE_C_COMPILER=/usr/local/gcc-10",
+                            "-DCMAKE_CXX_COMPILER=/usr/bin/gcc++-10",
+                            "-DLLVM_INSTALL_UTILS=ON",
+                            "-DCMAKE_CXX_STANDARD=17",
+                            "-DLLVM_ENABLE_WERROR=OFF",
+                            "-DFLANG_ENABLE_WERROR=ON"
+                            "-DBUILD_SHARED_LIBS=ON",
+                            "-DLLVM_ENABLE_ASSERTIONS=ON",
+                            "-DCMAKE_BUILD_TYPE=Release",
                         ],
          ),
          'category' : 'flang'},
diff --git a/buildbot/osuosl/master/config/slaves.py b/buildbot/osuosl/master/config/slaves.py
--- a/buildbot/osuosl/master/config/slaves.py
+++ b/buildbot/osuosl/master/config/slaves.py
@@ -242,6 +242,7 @@
 
         create_slave("flang-aarch64-ubuntu-build"),
         create_slave("flang-aarch64-ubuntu-clang-build"),
+        create_slave("flang-aarch64-ubuntu-gcc10-build"),
         create_slave("nersc-flang"),
 
         # ML-Driven Compiler Optimizations build slave (Ubuntu x86_64)
diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py
--- a/buildbot/osuosl/master/config/status.py
+++ b/buildbot/osuosl/master/config/status.py
@@ -297,4 +297,15 @@
             builders=[
                 "ml-opt-dev-x86-64", "ml-opt-rel-x86-64", "ml-opt-devrel-x86-64"],
             addLogs=False),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers = False,
+            extraRecipients = ["caroline.concatto@arm.com"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = [
+                "flang-aarch64-ubuntu", "flang-aarch64-ubuntu-clang", 
+                "flang-aarch64-ubuntu-gcc10"],
+            addLogs=False,
+            num_lines = 15),
         ]