diff --git a/.github/workflows/fedora-cmake.yml b/.github/workflows/fedora-cmake.yml
index e2a4bb806..fa113d58b 100644
--- a/.github/workflows/fedora-cmake.yml
+++ b/.github/workflows/fedora-cmake.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: fedora:35
+          - container: fedora:38
             compiler: gcc
             compiler-version: 11  # Only used in cache action so far
             ignore-errors: true  # Stack trace test fails on Fedora (issue #118)
@@ -56,7 +56,7 @@ jobs:
 
     - name: Create Build Environment
       run: |
-        $RUN_CMD pip3 install --progress-bar=off absl-py clang
+        $RUN_CMD pip3 install --progress-bar=off absl-py clang>=13,<14
         $RUN_CMD cmake -E make_directory $GITHUB_WORKSPACE/build
 
     - name: Configure CMake
diff --git a/.github/workflows/ubuntu-cmake-contrib.yml b/.github/workflows/ubuntu-cmake-contrib.yml
index 193b97df1..7d8944891 100644
--- a/.github/workflows/ubuntu-cmake-contrib.yml
+++ b/.github/workflows/ubuntu-cmake-contrib.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
         contrib:
           - brotli
           - c-blosc
@@ -78,7 +78,7 @@ jobs:
 
     - name: Create Build Environment
       run: |
-        pip3 install absl-py clang
+        pip3 install absl-py clang>=14,<15
         cmake -E make_directory $GITHUB_WORKSPACE/build
 
     - name: Configure CMake