diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9b8896a..755f237 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,9 +49,12 @@ jobs:
           - toolset: gcc-10
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-18.04
+          - toolset: gcc-11
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-20.04
           - toolset: clang
             compiler: clang++-3.5
-            cxxstd: "03,11,14"
+            cxxstd: "03,11"
             os: ubuntu-16.04
             install: clang-3.5
           - toolset: clang
@@ -96,13 +99,14 @@ jobs:
             install: clang-7
           - toolset: clang
             compiler: clang++-8
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "03,11,14,17"
             os: ubuntu-20.04
             install: clang-8
           - toolset: clang
             compiler: clang++-9
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
+            install: clang-9
           - toolset: clang
             compiler: clang++-10
             cxxstd: "03,11,14,17,2a"
@@ -111,6 +115,10 @@ jobs:
             compiler: clang++-11
             cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
+          - toolset: clang
+            compiler: clang++-12
+            cxxstd: "03,11,14,17,20"
+            os: ubuntu-20.04
           - toolset: clang
             cxxstd: "03,11,14,17,2a"
             os: macos-10.15