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
@@ -2466,21 +2466,6 @@
 
 
     # BOLT builders managed by Meta
-    {'name': "bolt-x86_64-ubuntu",
-    'tags': ["bolt"],
-    'collapseRequests': False,
-    'workernames':["bolt-worker"],
-    'builddir': "bolt-x86_64-ubuntu-bolttests",
-    'factory' : BOLTBuilder.getBOLTCmakeBuildFactory(
-                    bolttests=True,
-                    extra_configure_args=[
-                        "-DLLVM_APPEND_VC_REV=OFF",
-                        "-DLLVM_CCACHE_BUILD=ON",
-                        "-DLLVM_ENABLE_PROJECTS=clang;lld;bolt",
-                        "-DLLVM_TARGETS_TO_BUILD=X86;AArch64",
-                        ],
-                    )},
-
     {'name' : 'bolt-x86_64-ubuntu-nfc',
     'tags'  : ["bolt"],
     'collapseRequests': False,
diff --git a/zorg/buildbot/builders/annotated/bolt-nfc.py b/zorg/buildbot/builders/annotated/bolt-nfc.py
--- a/zorg/buildbot/builders/annotated/bolt-nfc.py
+++ b/zorg/buildbot/builders/annotated/bolt-nfc.py
@@ -28,10 +28,8 @@
                       '-DLLVM_CCACHE_BUILD=ON',
                       '-DLLVM_ENABLE_ASSERTIONS=ON',
                       '-DLLVM_ENABLE_LLD=ON',
-                      '-DLLVM_ENABLE_PROJECTS=bolt',
+                      '-DLLVM_ENABLE_PROJECTS=clang;lld;bolt',
                       '-DLLVM_TARGETS_TO_BUILD=X86;AArch64',
-                      '-DBOLT_CLANG_EXE=/usr/bin/clang',
-                      '-DBOLT_LLD_EXE=/usr/bin/ld.lld',
                       '-DLLVM_EXTERNAL_PROJECTS=bolttests',
                       '-DLLVM_EXTERNAL_BOLTTESTS_SOURCE_DIR='+tests_dir,
                       ]