diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index af91dbe..d547783 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1540,6 +1540,36 @@
                         "-DCMAKE_CXX_STANDARD=17",
                     ])},
 
+    {'name' : "flang-aarch64-ubuntu-dylib",
+    'tags'  : ["flang"],
+    'workernames' : ["linaro-aarch64-flang-dylib"],
+    'builddir': "flang-aarch64-ubuntu-dylib",
+    'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                    clean=True,
+                    depends_on_projects=['llvm','mlir','clang','flang'],
+                    extra_configure_args=[
+                        "-DLLVM_TARGETS_TO_BUILD=AArch64",
+                        "-DFLANG_BUILD_NEW_DRIVER=ON",
+                        "-DLLVM_BUILD_LLVM_DYLIB=ON",
+                        "-DLLVM_LINK_LLVM_DYLIB=ON",
+                        "-DCMAKE_CXX_STANDARD=17",
+                    ])},
+
+    {'name' : "flang-aarch64-ubuntu-sharedlibs",
+    'tags'  : ["flang"],
+    'workernames' : ["linaro-aarch64-flang-sharedlibs"],
+    'builddir': "flang-aarch64-ubuntu-sharedlibs",
+    'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                    clean=True,
+                    depends_on_projects=['llvm','mlir','clang','flang'],
+                    extra_configure_args=[
+                        "-DLLVM_TARGETS_TO_BUILD=AArch64",
+                        "-DFLANG_BUILD_NEW_DRIVER=ON",
+                        "-DBUILD_SHARED_LIBS=ON",
+                        "-DLLVM_BUILD_EXAMPLES=ON",
+                        "-DCMAKE_CXX_STANDARD=17",
+                    ])},
+
     {'name' : "flang-aarch64-ubuntu-out-of-tree",
     'tags'  : ["flang"],
     'workernames' : ["linaro-aarch64-flang-oot"],
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
index c790656..8b57724 100644
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -45,6 +45,8 @@
         create_worker("linaro-aarch64-global-isel", properties={'jobs' : 32}, max_builds=1),
         create_worker("linaro-aarch64-lld", properties={'jobs' : 32}, max_builds=1),
         create_worker("linaro-aarch64-flang-oot", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-aarch64-flang-dylib", properties={'jobs' : 32}, max_builds=1),
+        create_worker("linaro-aarch64-flang-sharedlibs", properties={'jobs' : 32}, max_builds=1),
         # Libcxx testsuite has tests with timing assumptions.  Run single-threaded to make
         # sure we have plenty CPU cycle to satisfy timing assumptions.
         create_worker("linaro-aarch64-libcxx", properties={'jobs' : 1}, max_builds=1),