diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
index b83443e5..a0a39c0e 100644
--- a/.github/workflows/github-ci.yml
+++ b/.github/workflows/github-ci.yml
@@ -79,16 +79,18 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install libunwind-dev
+        # Detect the Ubuntu distribution codename
+        DIST_CODENAME=$(lsb_release -cs)
+        if [[ "$DIST_CODENAME" = "noble" && "$version" -le 12 ]]; then                                                                             
+          DIST_CODENAME="focal"
+        fi
         sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
         version=${{ matrix.version }}
-        if [[ $version -ge 13 ]]; then
-          sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-$version main"
-        fi
+        sudo add-apt-repository "deb http://apt.llvm.org/$DIST_CODENAME/ llvm-toolchain-$DIST_CODENAME-$version main"
         sudo apt-get update
         sudo apt-get install clang-$version lld libc++-$version-dev libc++abi-$version-dev  
         echo "CC=clang-$version" >> ${GITHUB_ENV}
         echo "CXX=clang++-$version" >> ${GITHUB_ENV}
-        echo "CC=clang-$version" >> ${GITHUB_ENV}
         echo "LDFLAGS=-fuse-ld=lld" >> ${GITHUB_ENV}
     - name: Initialize MSVC ${{ matrix.version }}
       if: startsWith(matrix.os, 'windows-')