diff --git a/infra/ansible/config/apt.yaml b/infra/ansible/config/apt.yaml
index 04b5f8f4d31a..d026fea3e037 100644
--- a/infra/ansible/config/apt.yaml
+++ b/infra/ansible/config/apt.yaml
@@ -14,7 +14,7 @@ apt:
       - vim
       - wget
       - clang-format
-      - clang-17
+      - clang-{{ clang_version }}
       - gcc-10
       - g++-10
       - lcov
diff --git a/infra/ansible/playbook.yaml b/infra/ansible/playbook.yaml
index 524b2a8c70c9..f9b59abacb5a 100644
--- a/infra/ansible/playbook.yaml
+++ b/infra/ansible/playbook.yaml
@@ -66,6 +66,8 @@
             pip.pkgs_nodeps[stage + '_' + arch] | default([], true) +
             pip.pkgs_nodeps[stage + '_' + accelerator] | default([], true)
           }}"
+
+        llvm_path: "/usr/lib/llvm-{{ clang_version }}/bin"
       tags: install_deps
 
     - role: fetch_srcs
diff --git a/infra/ansible/roles/install_deps/tasks/main.yaml b/infra/ansible/roles/install_deps/tasks/main.yaml
index 7fb6fbca173a..6b929edf3341 100644
--- a/infra/ansible/roles/install_deps/tasks/main.yaml
+++ b/infra/ansible/roles/install_deps/tasks/main.yaml
@@ -34,3 +34,9 @@
   ansible.builtin.pip:
     name: "{{ pip_pkgs_nodeps }}"
     extra_args: "--no-deps"
+
+- name: Install Clang Alternatives
+  command: update-alternatives --install /usr/bin/{{ item }} {{ item }} {{ llvm_path }}/{{ item }} 100
+  loop:
+    - clang
+    - clang++