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
@@ -1060,6 +1060,19 @@
     'builddir': "clang-with-thin-lto-ubuntu",
     'factory' : ClangLTOBuilder.getClangWithLTOBuildFactory(jobs=72, lto='thin')},
 
+    {'name' : "clang-with-thin-lto-wpd-ubuntu",
+    'tags'  : ["clang","lld","LTO"],
+    'workernames' : ["thinlto-x86-64-bot1"],
+    'builddir': "clang-with-thin-lto-wpd-ubuntu",
+    'factory' : ClangLTOBuilder.getClangWithLTOBuildFactory(
+                    jobs=72,
+                    lto='thin',
+                    extra_configure_args=[
+                        '-DLLVM_CCACHE_BUILD=ON',
+                        '-DCMAKE_CXX_FLAGS="-O3 -Xclang -fwhole-program-vtables -fno-split-lto-unit"',
+                        '-DCMAKE_C_FLAGS="-O3 -Xclang -fwhole-program-vtables -fno-split-lto-unit"',
+                        '-DCMAKE_EXE_LINKER_FLAGS="-Wl,--lto-whole-program-visibility"'])},
+
     {'name' : "clang-with-lto-ubuntu",
     'tags'  : ["clang","lld","LTO"],
     'workernames' : ["as-worker-91"],
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
@@ -238,6 +238,14 @@
         builders = [
             "flang-aarch64-ubuntu", "flang-aarch64-ubuntu-clang",
             "flang-aarch64-ubuntu-gcc10"]),
+    reporters.MailNotifier(
+        fromaddr="llvm.buildmaster@lab.llvm.org",
+        sendToInterestedUsers = False,
+        extraRecipients=[
+            "tejohnson@google.com"],
+        subject = "ThinLTO WPD Failure: %(builder)s",
+        mode = "failing",
+        builders = ["thinlto-x86-64-bot1"]),
 
 ]
 
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
@@ -231,4 +231,7 @@
                      properties={'jobs': 64}, max_builds=1),
         create_worker("ml-opt-devrel-x86-64-b1",
                      properties={'jobs': 64}, max_builds=1),
+
+        # Ubuntu x86_64
+        create_worker("thinlto-x86-64-bot1", properties={'jobs': 64}, max_builds=1),
         ]