diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5909c3..ddf9ada 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,13 +16,11 @@
       fail-fast: false
       matrix:
         name: [
-          ubuntu-18.04-gcc-4.9,
           ubuntu-18.04-gcc-5,
           ubuntu-18.04-gcc-6,
           ubuntu-18.04-gcc-7,
           ubuntu-18.04-gcc-8,
           ubuntu-18.04-gcc-9,
-          ubuntu-18.04-clang-3.5,
           ubuntu-18.04-clang-3.8,
           ubuntu-18.04-clang-4.0,
           ubuntu-18.04-clang-5.0,
@@ -30,6 +28,9 @@
           ubuntu-18.04-clang-7,
           ubuntu-18.04-clang-8,
           ubuntu-20.04-clang-9,
+          ubuntu-20.04-clang-10,
+          ubuntu-20.04-clang-11,
+          ubuntu-20.04-clang-11-no-exceptions,
           windows-2016-cl,
           windows-2016-clang-cl,
           windows-2016-clang,
@@ -46,11 +47,6 @@
         ]
 
         include:
-          - name: ubuntu-18.04-gcc-4.9
-            os: ubuntu-18.04
-            compiler: gcc
-            version: "4.9"
-
           - name: ubuntu-18.04-gcc-5
             os: ubuntu-18.04
             compiler: gcc
@@ -76,11 +72,6 @@
             compiler: gcc
             version: "9"
 
-          - name: ubuntu-18.04-clang-3.5
-            os: ubuntu-18.04
-            compiler: clang
-            version: "3.5"
-
           - name: ubuntu-18.04-clang-3.8
             os: ubuntu-18.04
             compiler: clang
@@ -116,6 +107,22 @@
             compiler: clang
             version: "9"
 
+          - name: ubuntu-20.04-clang-10
+            os: ubuntu-20.04
+            compiler: clang
+            version: "10"
+
+          - name: ubuntu-20.04-clang-11
+            os: ubuntu-20.04
+            compiler: clang
+            version: "11"
+
+          - name: ubuntu-20.04-clang-11-no-exceptions
+            os: ubuntu-20.04
+            compiler: clang
+            version: "11"
+            cmake_vars: "-DCMAKE_CXX_FLAGS=-fno-exceptions -DBUILD_TESTING=OFF -DBUILD_BENCHMARK=ON"
+
           - name: windows-2016-cl
             os: windows-2016
             compiler: cl
@@ -174,7 +181,7 @@
             version: "12.2"
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Install (Linux)
         if: runner.os == 'Linux'
@@ -256,6 +263,6 @@
       - name: Build & Test Release
         run: |
           cmake -E remove_directory build
-          cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
+          cmake -B build -S . -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_vars }}
           cmake --build build -j2
           cd build && ctest -j2 --output-on-failure