diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile
index 5496e28..481ada9 100644
--- a/Linux/CPPBuilder/Dockerfile
+++ b/Linux/CPPBuilder/Dockerfile
@@ -26,22 +26,22 @@ RUN apt-get update && apt-get install -y \
         pipx \
     && rm -rf /var/lib/apt/lists/* \
     \
-    # Install LLVM 18
+    # Install LLVM 21
     && wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
     && chmod +x /tmp/llvm.sh \
-    && /tmp/llvm.sh 18 all \
+    && /tmp/llvm.sh 21 all \
     \
-    # Symlinks for clang 18 tools
-    && ln -sf /usr/bin/clang-18 /usr/bin/clang \
-    && ln -sf /usr/bin/clang++-18 /usr/bin/clang++ \
-    && ln -sf /usr/bin/llvm-profdata-18 /usr/bin/llvm-profdata \
-    && ln -sf /usr/bin/llvm-cov-18 /usr/bin/llvm-cov \
-    && ln -sf /usr/bin/clang-format-18 /usr/bin/clang-format \
-    && ln -sf /usr/bin/clang-tidy-18 /usr/bin/clang-tidy \
-    && ln -sf /usr/bin/run-clang-tidy-18 /usr/bin/run-clang-tidy \
-    && ln -sf /usr/bin/llvm-ar-18 /usr/bin/llvm-ar \
-    && ln -sf /usr/bin/llvm-nm-18 /usr/bin/llvm-nm \
-    && ln -sf /usr/bin/llvm-ranlib-18 /usr/bin/llvm-ranlib \
+    # Symlinks for clang 21 tools
+    && ln -sf /usr/bin/clang-21 /usr/bin/clang \
+    && ln -sf /usr/bin/clang++-21 /usr/bin/clang++ \
+    && ln -sf /usr/bin/llvm-profdata-21 /usr/bin/llvm-profdata \
+    && ln -sf /usr/bin/llvm-cov-21 /usr/bin/llvm-cov \
+    && ln -sf /usr/bin/clang-format-21 /usr/bin/clang-format \
+    && ln -sf /usr/bin/clang-tidy-21 /usr/bin/clang-tidy \
+    && ln -sf /usr/bin/run-clang-tidy-21 /usr/bin/run-clang-tidy \
+    && ln -sf /usr/bin/llvm-ar-21 /usr/bin/llvm-ar \
+    && ln -sf /usr/bin/llvm-nm-21 /usr/bin/llvm-nm \
+    && ln -sf /usr/bin/llvm-ranlib-21 /usr/bin/llvm-ranlib \
     \
     # Reset ccache stats
     && ccache --zero-stats
@@ -58,7 +58,6 @@ RUN pipx ensurepath \
 # Build and install mold
 RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \
     && cd /tmp/mold \
-    && ./install-build-deps.sh \
     && cmake . -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_CXX_COMPILER=clang++ \
               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \