diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 3d845dab4..48ac7527b 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -2788,6 +2788,17 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
                     script="hip-build.sh",
                     checkout_llvm_sources=False,
                     script_interpreter=None)},
+    {'name' : "clang-hip-spirv",
+    'tags'  : ["clang"],
+    'workernames' : ["hip-vega20-0"],
+    'builddir': "clang-hip-spirv",
+    'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
+                    script="hip-build.sh",
+                    checkout_llvm_sources=False,
+                    script_interpreter=None,
+                    env={
+                        'AMDGPU_ARCHS': 'amdgcnspirv',
+                    })},
 
 # VE builders.
     {'name' : "clang-ve-ninja",
diff --git a/zorg/buildbot/builders/annotated/hip-build.sh b/zorg/buildbot/builders/annotated/hip-build.sh
index 83b4b095e..fa31c97c3 100755
--- a/zorg/buildbot/builders/annotated/hip-build.sh
+++ b/zorg/buildbot/builders/annotated/hip-build.sh
@@ -84,7 +84,7 @@ cmake -G Ninja \
   -DCMAKE_C_COMPILER_LAUNCHER=ccache \
   -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
   -DCMAKE_VERBOSE_MAKEFILE=1 \
-  -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" \
+  -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86;SPIRV" \
   -DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra" \
   -DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \
   -DCLANG_DEFAULT_LINKER=lld \