diff --git a/src/test/generate-matrix.py b/src/test/generate-matrix.py
index 1b5b0b7b7..220e03849 100755
--- a/src/test/generate-matrix.py
+++ b/src/test/generate-matrix.py
@@ -79,6 +79,11 @@ def add_build(
 
         command += f" -- {args}"
 
+        # TODO : remove this when the boost issue is dealt with
+        if env.get("CC", "gcc").find("clang") < 0:
+            cppflags = env.get("CPPFLAGS", "") + " -Wno-error=maybe-uninitialized"
+            env["CPPFLAGS"] = cppflags
+
         self.matrix.append(
             {
                 "name": name,
@@ -102,12 +107,12 @@ def __str__(self):
 
 matrix = BuildMatrix()
 
-# Ubuntu: gcc-8, distcheck
+# Ubuntu: gcc-12, distcheck
 matrix.add_build(
-    name="jammy - gcc-8,distcheck",
+    name="jammy - gcc-12,distcheck",
     env=dict(
-        CC="gcc-8",
-        CXX="g++-8",
+        CC="gcc-12",
+        CXX="g++-12",
         DISTCHECK="t",
     ),
     args="--prefix=/usr",
@@ -118,13 +123,15 @@ def __str__(self):
 
 # Ubuntu: py3.7,clang-6.0
 matrix.add_build(
-    name="jammy - clang-6.0",
+    name="jammy - clang-15",
     env=dict(
-        CC="clang-6.0",
-        CXX="clang++-6.0",
+        CC="clang-15",
+        CXX="clang++-15",
+        CFLAGS="-O2 -gdwarf-4",
         chain_lint="t",
         TEST_CHECK_PREREQS="t",
     ),
+    args='CXXFLAGS="-O2 -gdwarf-4"',
 )
 
 # Ubuntu: TEST_INSTALL
@@ -134,31 +141,51 @@ def __str__(self):
     docker_tag=True,
 )
 
-# Ubuntu 20.04: py3.8
+# Debian: gcc-12, distcheck
 matrix.add_build(
-    name="focal",
-    image="focal",
-    docker_tag=True,
+    name="bookworm - gcc-12,distcheck",
+    image="bookworm",
+    env=dict(
+        CC="gcc-12",
+        CXX="g++-12",
+        DISTCHECK="t",
+    ),
+    args="--prefix=/usr",
+)
+
+# Debian: py3.7,clang-6.0
+matrix.add_build(
+    name="bookworm - clang-15",
+    image="bookworm",
+    env=dict(
+        CC="clang-15",
+        CXX="clang++-15",
+        CFLAGS="-O2 -gdwarf-4",
+        chain_lint="t",
+        TEST_CHECK_PREREQS="t",
+    ),
+    args='CXXFLAGS="-O2 -gdwarf-4"',
 )
 
-# RHEL7 clone
+# Debian: TEST_INSTALL
 matrix.add_build(
-    name="el7",
-    image="el7",
+    name="bookworm - test-install",
+    image="bookworm",
+    env=dict(TEST_INSTALL="t"),
     docker_tag=True,
 )
 
-# RHEL8 clone
+# Ubuntu 20.04: py3.8
 matrix.add_build(
-    name="el8",
-    image="el8",
+    name="focal",
+    image="focal",
     docker_tag=True,
 )
 
-# Fedora33
+# RHEL8 clone
 matrix.add_build(
-    name="fedora33",
-    image="fedora33",
+    name="el8",
+    image="el8",
     docker_tag=True,
 )