diff --git a/Dockerfile b/Dockerfile
index 222fa21..3099075 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,10 @@ RUN wget https://deb.nodesource.com/setup_20.x -O /setup_node.sh && chmod +x /se
 
 RUN  apt-get install -y make rsync clang-21 clang-tools-21 llvm-21 bear lld xorriso \
                         zip gnupg openssh-client nodejs git build-essential qemu-system \
-                        autotools-dev autoconf
+                        autotools-dev autoconf mtools nasm
 
-RUN  ln -sf /usr/bin/clang-21 /usr/bin/clang && \
-     ln -sf /usr/bin/clang-doc-21 /usr/bin/clang-doc && \
-     ln -sf /usr/bin/llvm-ar-21 /usr/bin/llvm-ar
+RUN for tool in /usr/bin/*-21; do \
+        ln -sf "$tool" "${tool%-21}"; \
+    done
 
 CMD ["/bin/bash"]