diff --git a/.gitlab/ci/docker/python-osmesa/install_osmesa.sh b/.gitlab/ci/docker/python-osmesa/install_osmesa.sh
index 3643e435e3ba7bc02fe47fe5d8256390fb3b8409..7e91d5f1a8b4702a166960838a891ddf5656d8af 100755
--- a/.gitlab/ci/docker/python-osmesa/install_osmesa.sh
+++ b/.gitlab/ci/docker/python-osmesa/install_osmesa.sh
@@ -16,6 +16,7 @@ readonly mesa_url="https://archive.mesa3d.org/$mesa_filename"
 
 readonly osmesa_root="$HOME/osmesa"
 readonly osmesa_prefix="/opt/osmesa"
+readonly llvm_prefix="/opt/osmesa-llvm"
 
 readonly llvm_src="$osmesa_root/llvm/src"
 readonly llvm_build="$osmesa_root/llvm/build"
@@ -69,12 +70,15 @@ ls "$llvm_src"
 
 cmake -GNinja "$llvm_src/llvm" \
   -DCMAKE_BUILD_TYPE=Release \
-  -DLLVM_BUILD_LLVM_DYLIB=ON \
-  "-DCMAKE_INSTALL_PREFIX=$osmesa_prefix" \
+  -DBUILD_SHARED_LIBS=OFF \
+  -DLLVM_BUILD_LLVM_DYLIB=OFF \
+  "-DCMAKE_INSTALL_PREFIX=$llvm_prefix" \
   -DLLVM_ENABLE_RTTI=ON \
   -DLLVM_INSTALL_UTILS=ON \
   -DLLVM_ENABLE_LIBXML2=OFF \
   -DLLVM_ENABLE_BINDINGS=OFF \
+  -DBENCHMARK_ENABLE_ASSEMBLY_TEST=OFF \
+  -DLLVM_INSTALL_DOCS=OFF \
   "-DLLVM_TARGETS_TO_BUILD=$llvm_targets"
 ninja
 ninja install
@@ -87,7 +91,7 @@ venv/bin/pip install mako
 
 cat >llvm.ini <<EOF
 [binaries]
-llvm-config = '$osmesa_prefix/bin/llvm-config'
+llvm-config = '$llvm_prefix/bin/llvm-config'
 EOF
 
 meson \
@@ -102,7 +106,7 @@ meson \
   -Dshared-glapi=enabled \
   -Degl=disabled \
   -Dllvm=enabled \
-  -Dshared-llvm=enabled \
+  -Dshared-llvm=disabled \
   -Dgles1=disabled \
   -Dgles2=disabled \
   -Dglx=disabled \
diff --git a/.gitlab/ci/download_osmesa.cmake b/.gitlab/ci/download_osmesa.cmake
index bc0c876bec1c7a028c5b7a01ec087e84f01da068..c1c488b01b1dd567fef21df1434f55b0ce495ce4 100644
--- a/.gitlab/ci/download_osmesa.cmake
+++ b/.gitlab/ci/download_osmesa.cmake
@@ -13,10 +13,10 @@ if (NOT "$ENV{CMAKE_CONFIGURATION}" MATCHES "osmesa")
   return ()
 endif ()
 
-set(date "20230103")
+set(date "20230709")
 if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "x86_64")
   set(arch "x86_64")
-  set(sha256sum "c5f2b1327c1b26982346b6b90c9a852cbf52cf0c906ac35936646b00a2b5fbe8")
+  set(sha256sum "88712deb82dac88811e61ec2d72135b294cfb36be142c39a97e73d717331f1ea")
 else ()
   message(FATAL_ERROR
     "Unknown platform for OSMesa")