diff --git a/gitlab/image.yml b/gitlab/image.yml
index 2c51cf074..b4cf3eae6 100644
--- a/gitlab/image.yml
+++ b/gitlab/image.yml
@@ -41,12 +41,10 @@ image-mac:
     - mkdir image/dxc
     - mkdir image/moltenvk
 
-    # The specified commit includes an update to the DirectXShaderCompiler's
-    # CMakeList.txt which makes it compatible with cmake (4+).
-    - git clone https://github.com/microsoft/DirectXShaderCompiler.git
+    - git clone --recursive --branch v1.8.2502 https://github.com/microsoft/DirectXShaderCompiler.git
     - cd DirectXShaderCompiler
-    - git checkout 3035d316c35289b68e8fc9d8cf21d86a204fb0e2
-    - git submodule update --init --recursive
+    # Include a fix for CMake 4+.
+    - git cherry-pick 3035d316c35289b68e8fc9d8cf21d86a204fb0e2
     - mkdir build
     - cd build
     - cmake .. -C ../cmake/caches/PredefinedParams.cmake -D CMAKE_BUILD_TYPE=Release