diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d232807eeaa7..4c40dd0d4aa7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,11 +42,10 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
-    - name: Install Clang-16
+    - name: Setup Clang-16
+      # clang-16 is already installed in the ubuntu 24.04 used, but the default is clang-18,
+      # so we just need to modify where clang points.
       run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x ./llvm.sh
-        sudo ./llvm.sh 16
         sudo ln -s -f `which clang-16` `which clang`
         sudo ln -s -f `which clang++-16` `which clang++`
 
@@ -119,11 +118,10 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
-    - name: Install Clang-16
+    - name: Setup Clang-16
+      # clang-16 is already installed in the ubuntu 24.04 used, but the default is clang-18,
+      # so we just need to modify where clang points.
       run: |
-        wget https://apt.llvm.org/llvm.sh
-        chmod +x ./llvm.sh
-        sudo ./llvm.sh 16
         sudo ln -s -f `which clang-16` `which clang`
         sudo ln -s -f `which clang++-16` `which clang++`