diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8380186918bd..2ab43ae04bf1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -31,7 +31,9 @@ RUN wget https://apt.llvm.org/llvm.sh
 RUN chmod +x llvm.sh
 RUN ./llvm.sh 15 all
 RUN rm llvm.sh
-ENV CC="/usr/bin/clang-15"
+# Add the lib dir to the PATH. This helps Bazel find clang and VS Code find
+# clangd, without version suffixes.
+ENV PATH="/usr/lib/llvm-15/bin:${PATH}"
 
 # Update pip and install black and pre-commit.
 RUN pip3 install -U pip