diff --git a/.github/workflows/ci/matrix.json b/.github/workflows/ci/matrix.json
index 7541b2ab9d..f86337dbd0 100644
--- a/.github/workflows/ci/matrix.json
+++ b/.github/workflows/ci/matrix.json
@@ -1,18 +1,16 @@
 [
-{ "example": "foo", "toolchain": "clang-cxx17",                                     "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "gcc-7-cxx17",                                     "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "gcc-8-cxx17-fpic",                                "os": "ubuntu-18.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "clang-cxx17",                                     "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "gcc-7-cxx17",                                     "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "gcc-8-cxx17-fpic",                                "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
 { "example": "foo", "toolchain": "gcc-9-cxx17-fpic",                                "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "android-ndk-r17-api-24-arm64-v8a-clang-libcxx14", "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "analyze-cxx17",                                   "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "sanitize-address-cxx17",                          "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "sanitize-leak-cxx17",                             "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "sanitize-thread-cxx17",                           "os": "ubuntu-16.04", "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "osx-10-13-make-cxx14",                            "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "osx-10-13-cxx14",                                 "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "osx-10-15-dep-10-10-cxx17",                       "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "osx-11-0-arch-universal2",                        "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
-{ "example": "foo", "toolchain": "ios-nocodesign-13-2-dep-9-3",                     "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "android-ndk-r17-api-24-arm64-v8a-clang-libcxx14", "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "analyze-cxx17",                                   "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "sanitize-address-cxx17",                          "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "sanitize-leak-cxx17",                             "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "sanitize-thread-cxx17",                           "os": "ubuntu-20.04", "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "osx-10-15-make-cxx14",                            "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "osx-11-1-arch-universal2-cxx17",                  "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
+{ "example": "foo", "toolchain": "ios-nocodesign-14-4-dep-10-0-arm64",              "os": "macos-10.15",  "python": "3.8", "script": "build.sh"  },
 { "example": "foo", "toolchain": "ninja-vs-15-2017-win64-cxx17",                    "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
 { "example": "foo", "toolchain": "nmake-vs-15-2017-win64-cxx17",                    "os": "windows-2016", "python": "3.8", "script": "build.cmd" },
 { "example": "foo", "toolchain": "vs-16-2019-win64-sdk-10-0-18362-0-cxx17",         "os": "windows-2019", "python": "3.8", "script": "build.cmd" },