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
@@ -845,7 +845,7 @@
     ## X86_64 AVX2 Clang+LLVM check-all + test-suite
     {'name' : "clang-cmake-x86_64-avx2-linux",
     'tags'  : ["clang"],
-    'workernames' : ["avx2-intel64"],
+    'workernames' : ["sde-avx512-intel64"],
     'builddir': "clang-cmake-x86_64-avx2-linux",
     'factory' : ClangBuilder.getClangCMakeBuildFactory(
                     clean=False,
@@ -854,12 +854,12 @@
                     checkout_lld=False,
                     useTwoStage=False,
                     runTestSuite=True,
-                    nt_flags=['--cflag', '-march=broadwell', '--threads=80', '--build-threads=80'],
+                    testsuite_flags=['--cflag', '-march=cascadelake', '--threads=32', '--build-threads=32'],
                     env={'PATH':'/usr/bin/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'},
                     extra_cmake_args=[
                         "-DLLVM_ENABLE_ASSERTIONS=ON",
-                        "-DCMAKE_C_FLAGS='-march=broadwell'",
-                        "-DCMAKE_CXX_FLAGS='-march=broadwell'",
+                        "-DCMAKE_C_FLAGS='-march=cascadelake'",
+                        "-DCMAKE_CXX_FLAGS='-march=cascadelake'",
                         "-DLLVM_TARGETS_TO_BUILD='X86'"])},
 
     ## X86_64 AVX2 LNT test-suite in Benchmark mode