diff --git a/buildscript/modules/llvm.cmd b/buildscript/modules/llvm.cmd
index 4e567f26..66790093 100644
--- a/buildscript/modules/llvm.cmd
+++ b/buildscript/modules/llvm.cmd
@@ -12,8 +12,8 @@
 @if /I NOT "%cfgllvmbuild%"=="y" GOTO skipllvm
 
 @rem Get/update LLVM source code
-@set updllvmsrcver=17.0.6
-@if /I "%legacyllvm%"=="y" set updllvmsrcver=16.0.6
+@set updllvmsrcver=18.1.1
+@if /I "%legacyllvm%"=="y" set updllvmsrcver=17.0.6
 @set llvmsrcver=0
 @set llvmsrcloc="%devroot%\llvm-project\llvm\CMakeLists.txt"
 @if NOT EXIST %llvmsrcloc% set llvmsrcloc="%devroot%\llvm\CMakeLists.txt"
diff --git a/buildscript/modules/spirv.cmd b/buildscript/modules/spirv.cmd
index c29e9c6d..ab26aa2d 100644
--- a/buildscript/modules/spirv.cmd
+++ b/buildscript/modules/spirv.cmd
@@ -4,7 +4,7 @@
 @IF EXIST "%devroot%\spirv-tools\DEPS" IF NOT EXIST "%devroot%\spirv-tools\external\spirv-headers\" IF %gitstate% EQU 0 set canspvtools=0
 @if %cmakestate% EQU 0 set canspvtools=0
 
-@set spvtoolsrel=v2023.6.rc1
+@set spvtoolsrel=v2024.1.rc1
 @IF EXIST "%devroot%\spirv-tools\external\" IF %gitstate% GTR 0 (
 @echo Updating SPIRV tools source code...
 @cd "%devroot%\spirv-tools"