diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index f9d99cee..a519ee01 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -18,43 +18,14 @@ jobs:
         compiler:
           - g++-9
           - g++-10
-          - clang++-10
-          - clang++-11
-          - clang++-12
-        build_type: [Debug, Release]
-
-    runs-on: ubuntu-latest
-
-    env:
-      CXX: ${{ matrix.compiler }}
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - run: cmake -E make_directory build
-
-    - working-directory: build/
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-
-    - working-directory: build/
-      run: cmake --build .
-
-    - working-directory: build/
-      run: ctest --output-on-failure
-
-  linux-new:
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler:
           - g++-11
+          - g++-12
+          - clang++-12
           - clang++-13
           - clang++-14
         build_type: [Debug, Release]
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     env:
       CXX: ${{ matrix.compiler }}
@@ -85,6 +56,8 @@ jobs:
           - clang++-7
           - clang++-8
           - clang++-9
+          - clang++-10
+          - clang++-11
         build_type: [Debug, Release]
 
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index cb2aabc4..74f52812 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ['11', '12', '13']
+        xcode: ['13', '14']
         build_type: [Debug, Release]
 
     runs-on: macos-latest
@@ -39,3 +39,32 @@ jobs:
 
     - working-directory: build/
       run: ctest --config ${{ matrix.build_type }} --output-on-failure
+
+xcode-old:
+    strategy:
+      fail-fast: false
+      matrix:
+        xcode: ['11', '12']
+        build_type: [Debug, Release]
+
+    runs-on: macos-11
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: ${{ matrix.xcode }}
+
+    - run: cmake -E make_directory build
+
+    - working-directory: build/
+      run: cmake $GITHUB_WORKSPACE
+
+    - working-directory: build/
+      run: cmake --build . --config ${{ matrix.build_type }}
+
+    - working-directory: build/
+      run: ctest --config ${{ matrix.build_type }} --output-on-failure