diff --git a/src/bebe/templates/compiler/clang.Dockerfile b/src/bebe/templates/compiler/clang.Dockerfile
index d053847..d6e01d8 100644
--- a/src/bebe/templates/compiler/clang.Dockerfile
+++ b/src/bebe/templates/compiler/clang.Dockerfile
@@ -7,14 +7,20 @@ RUN git clone --depth 1 --branch {{ params.compiler.version }} https://github.co
 WORKDIR /tmp/llvm-project/build
 RUN cmake ../llvm \
       -DCMAKE_BUILD_TYPE=Release \
-      -DLLVM_ENABLE_PROJECTS="clang;lld" \
+      -DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt" \
       -DLLVM_TARGETS_TO_BUILD="X86" \
       -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
+      -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
+      -DLLVM_INCLUDE_TESTS=OFF \
+      -DLLVM_INCLUDE_BENCHMARKS=OFF \
       -DCMAKE_INSTALL_PREFIX=/opt/clang-{{ params.compiler.version }} \
       -DCMAKE_INSTALL_RPATH="/opt/clang-{{ params.compiler.version }}/lib" \
       -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
       -G "Ninja" && \
-    cmake --build . --target install -j"$(nproc)"
+    cmake --build . --target install -j"$(nproc)" && \
+    if [ -d /opt/clang-{{ params.compiler.version }}/include/x86_64-unknown-linux-gnu/c++/v1 ]; then \
+        cp -a /opt/clang-{{ params.compiler.version }}/include/x86_64-unknown-linux-gnu/c++/v1/* /opt/clang-{{ params.compiler.version }}/include/c++/v1/ || true; \
+    fi
 WORKDIR /
 RUN rm -rf /tmp/llvm-project
 {% endmacro %}