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
@@ -29,6 +29,7 @@
 reload(DoxygenDocsBuilder)
 
 
+'''
 all = [
 
 # Clang fast builders.
@@ -2489,8 +2490,10 @@
              "-DLLVM_TARGETS_TO_BUILD=X86",
              "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=ARC",
          ])},
+]
+'''
 
-
+all = [
     # BOLT builders managed by Meta
     {'name' : 'bolt-x86_64-ubuntu-nfc',
     'tags'  : ["bolt"],
@@ -2508,6 +2511,25 @@
                     is_nfc=True,
                     )},
 
+    {'name': "bolt-x86_64-ubuntu-clang-bolt-gcc",
+    'tags': ["bolt"],
+    'workernames':["bolt-worker"],
+    'builddir': "bolt-x86_64-ubuntu-clang-bolt-gcc",
+    'factory' : BOLTBuilder.getBOLTCmakeBuildFactory(
+                    bolttests=False,
+                    depends_on_projects=['bolt', 'clang', 'llvm'],
+                    cache='clang/cmake/caches/BOLT.cmake',
+                    targets=['clang++-bolt'],
+                    checks=['check-clang'],
+                    extra_configure_args=[
+                        "-DCMAKE_C_COMPILER=gcc",
+                        "-DCMAKE_CXX_COMPILER=g++",
+                        "-DLLVM_APPEND_VC_REV=OFF",
+                        "-DLLVM_CCACHE_BUILD=ON",
+                        ],
+                    )},
+
+
     {'name': "bolt-x86_64-ubuntu-clang-bolt-lto-pgo",
     'tags': ["bolt"],
     'workernames':["bolt-worker"],
@@ -2527,6 +2549,8 @@
                         "-DPGO_INSTRUMENT_LTO=Thin",
                         ],
                     )},
+]
+'''
 
     {'name': "bolt-x86_64-ubuntu-dylib",
     'tags': ["bolt"],
@@ -2744,3 +2768,4 @@
                         "-DLLVM_OPTIMIZED_TABLEGEN=ON"])},
 
 ]
+'''
diff --git a/buildbot/osuosl/master/config/release_builders.py b/buildbot/osuosl/master/config/release_builders.py
--- a/buildbot/osuosl/master/config/release_builders.py
+++ b/buildbot/osuosl/master/config/release_builders.py
@@ -21,8 +21,9 @@
 
 # Release builders.
 
-all = [
+all = []
 
+'''
 # Clang builders.
 
     {'name' : "llvm-clang-x86_64-win-release",
@@ -231,3 +232,4 @@
                     })},
 
 ]
+'''
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
@@ -7,7 +7,8 @@
 # Should be a single e-mail address
 status_email = str(config.options.get('Master Options', 'status_email')).split(',')
 
-all = [
+all = []
+'''
 
     # Report github status for all the release builders,
     # i.e. those with the "release" tag.
@@ -339,6 +340,7 @@
         mode = "failing",
         builders = ["clang-loongarch64-linux"]),
 ]
+'''
 
 
 from twisted.python import log
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -8,6 +8,7 @@
     password = config.options.get('Worker Passwords', name)
     return worker.Worker(name, password=password, *args, **kwargs)
 
+'''
 def get_all():
     return [
         # FreeBSD
@@ -320,4 +321,9 @@
 
         # CSKY T-HEAD workers
         create_worker("thead-clang-csky", properties={'jobs' : 32}, max_builds=1),
+'''
+def get_all():
+    return [
+        # BOLT worker
+        create_worker("bolt-worker", properties={'jobs' : 16, 'loadaverage': 16}, max_builds=1),
         ]
diff --git a/buildbot/osuosl/master/master.cfg b/buildbot/osuosl/master/master.cfg
--- a/buildbot/osuosl/master/master.cfg
+++ b/buildbot/osuosl/master/master.cfg
@@ -85,7 +85,7 @@
 # has a variety to choose from, like IRC bots.
 
 # Configure MailNotifier, IRC, buildbot.reporters.github.GitHubStatusPush, buildbot.reporters.github.GitHubCommentPush
-c['services'] = config.status.getReporters()
+#c['services'] = config.status.getReporters()
 
 ####### PROJECT IDENTITY
 
@@ -97,8 +97,8 @@
 c['www'] = dict(port=8011,
                 plugins=dict(waterfall_view={}, console_view={}, grid_view={}), # TODO: badges
                 default_page='console',
-                auth=config.auth.getAuth(),
-                authz=config.auth.getAuthz(),
+                #auth=config.auth.getAuth(),
+                #authz=config.auth.getAuthz(),
                 #logRotateLength=
                 #maxRotatedFiles=
                 #versions=
diff --git a/zorg/buildbot/commands/LitTestCommand.py b/zorg/buildbot/commands/LitTestCommand.py
--- a/zorg/buildbot/commands/LitTestCommand.py
+++ b/zorg/buildbot/commands/LitTestCommand.py
@@ -161,8 +161,8 @@
     super().__init__(*args, **kwargs)
     self.maxLogs = int(max_logs)
     self.logObserver = LitLogObserver(self.maxLogs, parseSummaryOnly)
-    self.addFactoryArguments(max_logs=max_logs)
-    self.addFactoryArguments(parseSummaryOnly=parseSummaryOnly)
+    #self.addFactoryArguments(max_logs=max_logs)
+    #self.addFactoryArguments(parseSummaryOnly=parseSummaryOnly)
     self.addLogObserver('stdio', self.logObserver)
 
   def evaluateCommand(self, cmd):
diff --git a/zorg/buildbot/util/phasedbuilderutils.py b/zorg/buildbot/util/phasedbuilderutils.py
--- a/zorg/buildbot/util/phasedbuilderutils.py
+++ b/zorg/buildbot/util/phasedbuilderutils.py
@@ -20,8 +20,8 @@
         Trigger.__init__(self, **kwargs)
         self.name = name
         self.triggeredBuilders = triggeredBuilders
-        self.addFactoryArguments(name = name,
-                                 triggeredBuilders = triggeredBuilders)
+        #self.addFactoryArguments(name = name,
+        #                         triggeredBuilders = triggeredBuilders)
     def start(self):
         # Add a log linking to the triggered builders, if supplied.
         if self.triggeredBuilders: