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
@@ -1096,6 +1096,32 @@
                               'CXX': 'clang++',
                               'LD': 'lld',
                         })},
+       # Latest stable fedora running on Red Hat internal OpenShift cluster (PSI)  
+       {'name': 'x86_64-fedora-clang',
+        'mergeRequests': False,
+        'slavenames': ['fedora-llvm-x86_64'],
+        'builddir': 'x86_64-fedora-clang',
+        'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                        clean=True,
+                        depends_on_projects=['llvm', 'clang', 'clang-tools-extra', 'compiler-rt', 'lld', 'mlir'],
+                        checks=['check-all'],
+                        extra_configure_args=[
+                            '-DCMAKE_BUILD_TYPE=Release',
+                            '-DCMAKE_C_COMPILER=/usr/bin/gcc',
+                            '-DCMAKE_CXX_COMPILER=/usr/bin/g++',
+                            '-DLLVM_ENABLE_ASSERTIONS=On',
+                            '-DLLVM_BUILD_EXAMPLES=On',
+                            "-DLLVM_LIT_ARGS='-v --xunit-xml-output test-results.xml'",
+                            '-DLLVM_CCACHE_BUILD=On',
+                            '-DLLVM_CCACHE_DIR=/ccache',
+                            '-DLLVM_CCACHE_MAXSIZE=20G',
+                            '-DLLVM_TARGETS_TO_BUILD=X86',
+                            '-DCMAKE_EXPORT_COMPILE_COMMANDS=1',
+                            '-DLLVM_BUILD_LLVM_DYLIB=On',
+                            '-DLLVM_LINK_LLVM_DYLIB=On',
+                            '-DCLANG_LINK_CLANG_DYLIB=On',
+                            '-DBUILD_SHARED_LIBS=Off',
+                        ])},
     ]
 
 # Sanitizer builders.
diff --git a/buildbot/osuosl/master/config/slaves.py b/buildbot/osuosl/master/config/slaves.py
--- a/buildbot/osuosl/master/config/slaves.py
+++ b/buildbot/osuosl/master/config/slaves.py
@@ -158,6 +158,9 @@
         # Fedora latest stable x86_64, Intel i5-2500, 4 cores, 12GB RAM
         create_slave("lldb-x86_64-fedora", properties={'jobs': 4}, max_builds=1),
 
+        # Fedora latest stable, arch=x86_64, running on RedHat internal OpenShift PSI cluster
+        create_slave("fedora-llvm-x86_64", properties={'jobs': 32}, max_builds=1),
+
         # Debian x86_64 Buster Xeon(R) Gold 6154 CPU @ 3.00GHz, 192GB RAM
         create_slave("lldb-x86_64-debian", properties={'jobs': 72}, max_builds=1),