diff --git a/tools/dockerfile/msan_cxx/Dockerfile b/tools/dockerfile/grpc_clang/Dockerfile
similarity index 87%
rename from tools/dockerfile/msan_cxx/Dockerfile
rename to tools/dockerfile/grpc_clang/Dockerfile
index d12cee6b5d4..0928121755f 100644
--- a/tools/dockerfile/msan_cxx/Dockerfile
+++ b/tools/dockerfile/grpc_clang/Dockerfile
@@ -23,7 +23,10 @@ RUN mv libcxx llvm/projects
 RUN mv libcxxabi llvm/projects
 
 RUN mkdir llvm-build
-RUN cd llvm-build && cmake ../llvm
+RUN cd llvm-build && cmake \
+  -DCMAKE_BUILD_TYPE:STRING=Release \
+  -DLLVM_TARGETS_TO_BUILD:STRING=X86 \
+  ../llvm
 RUN make -C llvm-build && make -C llvm-build install && rm -rf llvm-build
 
 CMD ["bash"]