diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01a637726..ddbc04b09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ A curated, chronologically ordered list of notable changes in [Gitpod's default
 ## 2023-10-09
 
 - Bump Rust to `1.73.0`
+- Upgrade Clang to `17.0.2`
 
 ## 2023-10-06
 
diff --git a/chunks/lang-c/Dockerfile b/chunks/lang-c/Dockerfile
index 37b85b31b..46f7f4c01 100644
--- a/chunks/lang-c/Dockerfile
+++ b/chunks/lang-c/Dockerfile
@@ -8,14 +8,21 @@ ENV TRIGGER_REBUILD=1
 
 RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg \
     && echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ \
-    llvm-toolchain-jammy-15 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \
+    llvm-toolchain-jammy-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null \
     && apt update \
     && install-packages \
-        clang \
-        clangd \
-        clang-format \
-        clang-tidy \
+        clang-17 \
+        clangd-17 \
+        clang-format-17 \
+        clang-tidy-17 \
         gdb \
-        lld
+        lld-17
+
+RUN sudo update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-17/bin/clang 100 \
+    && sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-17/bin/clang++ 100 \
+    && sudo update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-17 100 \
+    && sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-17 100 \
+    && sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-17 100 \
+    && sudo update-alternatives --install /usr/bin/lld lld /usr/bin/lld-17 100
 
 USER gitpod