diff --git a/.github/workflows/linux-full-tests.yml b/.github/workflows/linux-full-tests.yml
index d220a6b5566..87e7c7382f8 100644
--- a/.github/workflows/linux-full-tests.yml
+++ b/.github/workflows/linux-full-tests.yml
@@ -50,6 +50,11 @@ jobs:
             tag: lunar
             cc: gcc
             cxx: g++
+          - name: "gcc 13.x"
+            shortname: gcc13
+            tag: mantic
+            cc: gcc
+            cxx: g++
           - name: "Clang 6 (Boost 1.72)"
             shortname: clang6
             tag: bionic
@@ -100,6 +105,11 @@ jobs:
             tag: lunar
             cc: clang
             cxx: clang++
+          - name: "Clang 16"
+            shortname: clang16
+            tag: mantic
+            cc: clang
+            cxx: clang++
           - name: "C++14 mode"
             shortname: c++14
             tag: rolling
diff --git a/.github/workflows/linux-nondefault.yml b/.github/workflows/linux-nondefault.yml
index 81efd95976c..c0788718793 100644
--- a/.github/workflows/linux-nondefault.yml
+++ b/.github/workflows/linux-nondefault.yml
@@ -50,6 +50,11 @@ jobs:
             tag: lunar
             cc: gcc
             cxx: g++
+          - name: "gcc 13.x"
+            shortname: gcc13
+            tag: mantic
+            cc: gcc
+            cxx: g++
           - name: "Clang 6 (Boost 1.72)"
             shortname: clang6
             tag: bionic
@@ -100,6 +105,11 @@ jobs:
             tag: lunar
             cc: clang
             cxx: clang++
+          - name: "Clang 16"
+            shortname: clang16
+            tag: mantic
+            cc: clang
+            cxx: clang++
           - name: "C++14 mode"
             shortname: c++14
             tag: rolling
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 7ed2fc088ee..8efda0ff48f 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -42,13 +42,18 @@ jobs:
             tag: jammy
             cc: gcc
             cxx: g++
-            tests: true
           - name: "gcc 12.x"
             shortname: gcc12
             tag: lunar
             cc: gcc
             cxx: g++
             tests: true
+          - name: "gcc 13.x"
+            shortname: gcc13
+            tag: mantic
+            cc: gcc
+            cxx: g++
+            tests: true
           - name: "Clang 6 (Boost 1.72)"
             shortname: clang6
             tag: bionic
@@ -94,13 +99,18 @@ jobs:
             tag: jammy
             cc: clang
             cxx: clang++
-            tests: true
           - name: "Clang 15"
             shortname: clang15
             tag: lunar
             cc: clang
             cxx: clang++
             tests: true
+          - name: "Clang 16"
+            shortname: clang16
+            tag: mantic
+            cc: clang
+            cxx: clang++
+            tests: true
           - name: "C++14 mode"
             shortname: c++14
             tag: rolling