diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 90d654b..21c9d01 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -26,48 +26,35 @@ jobs:
             extra_args: '--coverage --tbb --num-tasks=64'
             extra_packages: 'clang-tidy'
             standard: '11'
-            os-release: '20.04'
+            os-release: '22.04'
           - build_type: 'RelWithDebInfo'
             build_libs: 'shared'
             compiler: 'clang-17'
             extra_args: '--num-tasks=256 --sanitizer --sanitizer-type=leak --static-analysis'
-            extra_packages: 'clang-tidy-12'
+            extra_packages: 'clang-tidy-15'
             standard: '11'
-            os-release: '20.04'
+            os-release: '22.04'
           - build_type: 'RelWithDebInfo'
             build_libs: 'shared'
             compiler: 'clang-17'
             extra_args: '--num-tasks=256 --tbb --sanitizer --sanitizer-type=address --static-analysis'
-            extra_packages: 'clang-tidy-12'
+            extra_packages: 'clang-tidy-15'
             standard: '14'
-            os-release: '20.04'
+            os-release: '22.04'
           - build_type: 'RelWithDebInfo'
             build_libs: 'shared'
             compiler: 'clang-17'
             extra_args: '--num-tasks=256 --tbb --sanitizer --sanitizer-type=thread --static-analysis'
             extra_cmake: '-DPTL_USE_LOCKS=ON'
-            extra_packages: 'clang-tidy-12'
+            extra_packages: 'clang-tidy-15'
             standard: '17'
-            os-release: '20.04'
-        exclude:
-          # Ubuntu 20.04 (Focal)
-          - os-release: '20.04'
-            compiler: 'gcc-12'
-          # Ubuntu 22.04 (Jammy)
-          - os-release: '22.04'
-            compiler: 'gcc-13'
-          - os-release: '22.04'
-            compiler: 'clang-13'
-          - os-release: '22.04'
-            compiler: 'clang-14'
-          - os-release: '22.04'
-            compiler: 'clang-15'
+            os-release: '22.04'
         build_type: ['Release']
         build_libs: ['shared static']
-        compiler: ['gcc-13', 'gcc-10', 'gcc-11', 'gcc-12', 'clang-13', 'clang-14', 'clang-15', 'clang-16', 'clang-17']
+        compiler: ['gcc-10', 'gcc-11', 'gcc-12', 'gcc-13', 'clang-13', 'clang-14', 'clang-15']
         extra_args: ['--num-tasks=256 --tbb']
         standard: ['11', '17']
-        os-release: ['20.04', '22.04']
+        os-release: ['22.04']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/macos-ci.yml b/.github/workflows/macos-ci.yml
index f982b30..88f203f 100644
--- a/.github/workflows/macos-ci.yml
+++ b/.github/workflows/macos-ci.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         build_libs: ["shared static"]
         build_type: ["Release"]
-        compiler: ["clang-16", "clang-17"]
+        compiler: ["clang-13", "clang-14"]
         extra_args: ["--num-tasks=256 --tbb"]
         extra_packages: ["clangdev tbb-devel"]
         os-release: ["macos-11", "macos-12", "macos-13""]