diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 8a4807bb..8464e380 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -39,6 +39,24 @@ jobs:
             macos_cc: gcc-10
             apt_package: g++-10
             homebrew_package: gcc@10
+          - cxx: g++-11
+            cc: gcc-11
+            macos_cxx: g++-11
+            macos_cc: gcc-11
+            apt_package: g++-11
+            homebrew_package: gcc@11
+          - cxx: g++-12
+            cc: gcc-12
+            macos_cxx: g++-12
+            macos_cc: gcc-12
+            apt_package: g++-12
+            homebrew_package: gcc@12
+          - cxx: g++-13
+            cc: gcc-13
+            macos_cxx: g++-13
+            macos_cc: gcc-13
+            apt_package: g++-13
+            homebrew_package: gcc@13
           - cxx: clang++-7
             cc: clang-7
             macos_cxx: /usr/local/opt/llvm@7/bin/clang++
@@ -105,6 +123,11 @@ jobs:
             compiler: {cxx: g++-9, cc: gcc-9, macos_cxx: g++-9, macos_cc: gcc-9, homebrew_package: gcc@9, apt_package: g++-9}
           - os: macos-13
             compiler: {cxx: clang++-7, cc: clang-7, macos_cxx: /usr/local/opt/llvm@7/bin/clang++, macos_cc: /usr/local/opt/llvm@7/bin/clang, apt_package: clang-7, homebrew_package: llvm@7}
+          # Ubuntu 20.04 doesn't have GCC 12, 13 yet
+          - os: ubuntu-20.04
+            compiler: {cxx: g++-12, cc: gcc-12, macos_cxx: g++-12, macos_cc: gcc-12, homebrew_package: gcc@12, apt_package: g++-12}
+          - os: ubuntu-20.04
+            compiler: {cxx: g++-13, cc: gcc-13, macos_cxx: g++-13, macos_cc: gcc-13, homebrew_package: gcc@13, apt_package: g++-13}
           # Ubuntu 22.04 doesn't have gcc 7, 8 or clang 7, 8, 9, 10 anymore
           - os: ubuntu-22.04
             compiler: {cxx: g++-7, cc: gcc-7, macos_cxx: g++-7, macos_cc: gcc-7, homebrew_package: gcc@7, apt_package: g++-7}