diff --git a/.github/workflows/ubuntu-latest-clang.yml b/.github/workflows/ubuntu-latest-clang.yml
index 3056042..66345af 100644
--- a/.github/workflows/ubuntu-latest-clang.yml
+++ b/.github/workflows/ubuntu-latest-clang.yml
@@ -23,7 +23,8 @@ jobs:
 
     strategy:
       matrix:
-        version: ['16', '15', '14', '13', '12', '11', '10', '9', '8', '7']
+        version:
+          ['latest', '16', '15', '14', '13', '12', '11', '10', '9', '8', '7']
         type: [Release, Debug]
 
     runs-on: ubuntu-latest
@@ -31,13 +32,13 @@ jobs:
     name: "Clang ${{matrix.version}}: ${{matrix.type}}"
 
     container:
-      image: teeks99/clang-ubuntu:${{matrix.version}}
+      image: silkeh/clang:${{matrix.version}}
 
       options: -v /usr/local:/host_usr_local
 
     env:
-      CC: clang-${{ matrix.version }}
-      CXX: clang++-${{ matrix.version }}
+      CC: clang
+      CXX: clang++
       CXXFLAGS: -stdlib=libc++
 
     steps:
diff --git a/.github/workflows/ubuntu-latest-icc.yml b/.github/workflows/ubuntu-latest-icc.yml
index 5d4a0d2..6629d82 100644
--- a/.github/workflows/ubuntu-latest-icc.yml
+++ b/.github/workflows/ubuntu-latest-icc.yml
@@ -16,9 +16,9 @@ on:
       - bugfix/**
 
 env:
-  URL_BASE: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431
-  LINUX_BASEKIT_SCRIPT: l_BaseKit_p_2021.1.0.2659_offline.sh
-  LINUX_HPCKIT_SCRIPT: l_HPCKit_p_2021.1.0.2684_offline.sh
+  LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
+  LINUX_HPCKIT_URL:
+    https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
 
 jobs:
   icc_tests:
@@ -46,14 +46,13 @@ jobs:
           path: |
             /opt/intel/oneapi/compiler
           key: >-
-            install-${{env.URL_BASE}}/${{env.LINUX_HPCKIT_SCRIPT}}-
+            install-${{env.LINUX_HPCKIT_URL}}-
             ${{env.LINUX_CPP_COMPONENTS_WEB}}-
             compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}}
 
       - name: Install icc
         run: >-
-          script/ci_install_icc.sh ${URL_BASE}/${LINUX_HPCKIT_SCRIPT}
-          ${URL_BASE}/${LINUX_CPP_COMPONENTS_WEB}
+          script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
 
       - name: CMake
         run: echo "/host_usr_local/bin" >> $GITHUB_PATH