diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6b0a18a..5ffb9004 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,7 +95,6 @@ jobs:
       if: startsWith(matrix.os, 'ubuntu')
       run: |
         COMMON_PKGS="libolm-dev ninja-build"
-        #COMMON_PKGS="$COMMON_PKGS clang-15" # Workaround for https://github.com/actions/runner-images/issues/8659
         sudo apt-get -qq update
         sudo apt-get -qq install $COMMON_PKGS \
                 libgl1-mesa-dev qt6-declarative-dev qt6-base-private-dev qt6-tools-dev qt6-tools-dev-tools \
@@ -107,9 +106,8 @@ jobs:
             echo "CC=gcc" >>$GITHUB_ENV
             echo "CXX=g++" >>$GITHUB_ENV
         elif [[ '${{ runner.os }}' == 'Linux' ]]; then
-            # REMOVECOMMENT: Workaround for https://github.com/actions/runner-images/issues/8659
-            echo "CC=clang-16" >>$GITHUB_ENV
-            echo "CXX=clang++-16" >>$GITHUB_ENV
+            echo "CC=clang-17" >>$GITHUB_ENV
+            echo "CXX=clang++-17" >>$GITHUB_ENV
         fi
         echo "CMAKE_ARGS=-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
               ${{ runner.os != 'Linux' && '-DCMAKE_MAKE_PROGRAM=$IQTA_TOOLS/Ninja/ninja' || '' }} \