diff --git a/.github/generate-job-matrix.py b/.github/generate-job-matrix.py
index 4c387a14..a74a7550 100644
--- a/.github/generate-job-matrix.py
+++ b/.github/generate-job-matrix.py
@@ -160,12 +160,8 @@ def main():
         case "clang-tidy":
             collector.all_combinations(config=configs["Clang-18 (x86-64)"])
         case "freestanding":
-            # TODO For some reason Clang-18 Debug with -ffreestanding does not pass CMakeTestCXXCompiler
             collector.all_combinations(
-                filter=lambda e: not (
-                    e.config.name.startswith("Clang-18") and e.build_type == "Debug"
-                ),
-                config=[configs[c] for c in ["GCC-14", "Clang-18 (x86-64)"]],
+                config=[configs[c] for c in ["GCC-14", "Clang-20 (x86-64)"]],
                 contracts="none",
                 std=23,
             )