diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml
index cc54843547..07075ccfe1 100644
--- a/.github/workflows/build-debian.yml
+++ b/.github/workflows/build-debian.yml
@@ -47,78 +47,15 @@ env:
   # duplication, we define it here using environment variables and create the
   # matrix in the first job. The matrix defined below should be kept in sync
   # with https://github.com/XRPLF/ci/blob/main/.github/workflows/debian.yml.
-#  STRATEGY_MATRIX_ARCHITECTURE: >-
-#    [
-#      {
-#          "platform": "linux/amd64",
-#          "runner": ["self-hosted", "Linux", "X64"]
-#      },
-#      {
-#          "platform": "linux/arm64",
-#          "runner": ["self-hosted", "Linux", "ARM64"]
-#      }
-#    ]
-#  STRATEGY_MATRIX_OS: >-
-#    [
-#        {
-#            "distro": "debian",
-#            "release": "bookworm",
-#            "compiler_name": "gcc",
-#            "compiler_version": "12"
-#        },
-#        {
-#            "distro": "debian",
-#            "release": "bookworm",
-#            "compiler_name": "gcc",
-#            "compiler_version": "13"
-#        },
-#        {
-#            "distro": "debian",
-#            "release": "bookworm",
-#            "compiler_name": "gcc",
-#            "compiler_version": "14"
-#        },
-#        {
-#            "distro": "debian",
-#            "release": "bookworm",
-#            "compiler_name": "clang",
-#            "compiler_version": "16"
-#        },
-#        {
-#            "distro": "debian",
-#            "release": "bookworm",
-#            "compiler_name": "clang",
-#            "compiler_version": "17"
-#        },
-#        {
-#            "distro": "debian",
-#            "release": "bookworm",
-#            "compiler_name": "clang",
-#            "compiler_version": "18"
-#        },
-#        {
-#            "distro": "debian",
-#            "release": "bookworm",
-#            "compiler_name": "clang",
-#            "compiler_version": "19"
-#        }
-#    ]
-#  STRATEGY_MATRIX_BUILD_TYPE: >-
-#    [
-#      "Debug",
-#      "Release"
-#    ]
-#  STRATEGY_MATRIX_CMAKE_ARGS: >-
-#    [
-#      "-DUnity=OFF",
-#      "-DUnity=ON"
-#    ]
-
   STRATEGY_MATRIX_ARCHITECTURE: >-
     [
       {
           "platform": "linux/amd64",
           "runner": ["self-hosted", "Linux", "X64"]
+      },
+      {
+          "platform": "linux/arm64",
+          "runner": ["self-hosted", "Linux", "ARM64"]
       }
     ]
   STRATEGY_MATRIX_OS: >-
@@ -128,16 +65,78 @@ env:
             "release": "bookworm",
             "compiler_name": "gcc",
             "compiler_version": "12"
+        },
+        {
+            "distro": "debian",
+            "release": "bookworm",
+            "compiler_name": "gcc",
+            "compiler_version": "13"
+        },
+        {
+            "distro": "debian",
+            "release": "bookworm",
+            "compiler_name": "gcc",
+            "compiler_version": "14"
+        },
+        {
+            "distro": "debian",
+            "release": "bookworm",
+            "compiler_name": "clang",
+            "compiler_version": "16"
+        },
+        {
+            "distro": "debian",
+            "release": "bookworm",
+            "compiler_name": "clang",
+            "compiler_version": "17"
+        },
+        {
+            "distro": "debian",
+            "release": "bookworm",
+            "compiler_name": "clang",
+            "compiler_version": "18"
+        },
+        {
+            "distro": "debian",
+            "release": "bookworm",
+            "compiler_name": "clang",
+            "compiler_version": "19"
         }
     ]
   STRATEGY_MATRIX_BUILD_TYPE: >-
     [
+      "Debug",
       "Release"
     ]
   STRATEGY_MATRIX_CMAKE_ARGS: >-
     [
+      "-DUnity=OFF",
       "-DUnity=ON"
     ]
+#  STRATEGY_MATRIX_ARCHITECTURE: >-
+#    [
+#      {
+#          "platform": "linux/amd64",
+#          "runner": ["self-hosted", "Linux", "X64"]
+#      }
+#    ]
+#  STRATEGY_MATRIX_OS: >-
+#    [
+#        {
+#            "distro": "debian",
+#            "release": "bookworm",
+#            "compiler_name": "gcc",
+#            "compiler_version": "12"
+#        }
+#    ]
+#  STRATEGY_MATRIX_BUILD_TYPE: >-
+#    [
+#      "Release"
+#    ]
+#  STRATEGY_MATRIX_CMAKE_ARGS: >-
+#    [
+#      "-DUnity=ON"
+#    ]
 
 jobs:
   # Generate the strategy matrix and expose environment variables to be used by
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 63bca84cdc..fef1fede57 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -46,22 +46,6 @@ env:
   # GitHub does not allow us to specify a reusable matrix strategy, so to avoid
   # duplication, we define it here using environment variables and create the
   # matrix in the first job.
-#  STRATEGY_MATRIX_ARCHITECTURE: >-
-#    [
-#      {
-#        "runner": ["self-hosted", "macOS", "ARM64", "mac-runner-m1"]
-#      }
-#    ]
-#  STRATEGY_MATRIX_BUILD_TYPE: >-
-#    [
-#      "Debug",
-#      "Release"
-#    ]
-#  STRATEGY_MATRIX_CMAKE_ARGS: >-
-#    [
-#      "-DUnity=OFF",
-#      "-DUnity=ON"
-#    ]
   STRATEGY_MATRIX_ARCHITECTURE: >-
     [
       {
@@ -70,12 +54,28 @@ env:
     ]
   STRATEGY_MATRIX_BUILD_TYPE: >-
     [
+      "Debug",
       "Release"
     ]
   STRATEGY_MATRIX_CMAKE_ARGS: >-
     [
+      "-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DUnity=OFF",
       "-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DUnity=ON"
     ]
+#  STRATEGY_MATRIX_ARCHITECTURE: >-
+#    [
+#      {
+#        "runner": ["self-hosted", "macOS", "ARM64", "mac-runner-m1"]
+#      }
+#    ]
+#  STRATEGY_MATRIX_BUILD_TYPE: >-
+#    [
+#      "Release"
+#    ]
+#  STRATEGY_MATRIX_CMAKE_ARGS: >-
+#    [
+#      "-DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DUnity=ON"
+#    ]
 
 jobs:
   # Generate the strategy matrix and expose environment variables to be used by
diff --git a/.github/workflows/build-rhel.yml b/.github/workflows/build-rhel.yml
index e223c850ca..17cafcc663 100644
--- a/.github/workflows/build-rhel.yml
+++ b/.github/workflows/build-rhel.yml
@@ -48,53 +48,15 @@ env:
   # duplication, we define it here using environment variables and create the
   # matrix in the first job. The matrix defined below should be kept in sync
   # with https://github.com/XRPLF/ci/blob/main/.github/workflows/rhel.yml.
-#  STRATEGY_MATRIX_ARCHITECTURE: >-
-#    [
-#      {
-#          "platform": "linux/amd64",
-#          "runner": ["self-hosted", "Linux", "X64"]
-#      },
-#      {
-#          "platform": "linux/arm64",
-#          "runner": ["self-hosted", "Linux", "ARM64"]
-#      }
-#    ]
-#  STRATEGY_MATRIX_OS: >-
-#    [
-#        {
-#            "distro": "rhel",
-#            "release": "9.6",
-#            "compiler_name": "gcc",
-#            "compiler_version": "13"
-#        },
-#        {
-#            "distro": "rhel",
-#            "release": "9.6",
-#            "compiler_name": "gcc",
-#            "compiler_version": "14"
-#        },
-#        {
-#            "distro": "rhel",
-#            "release": "9.6",
-#            "compiler_name": "clang",
-#            "compiler_version": "any"
-#        },
-#    ]
-#  STRATEGY_MATRIX_BUILD_TYPE: >-
-#    [
-#      "Debug",
-#      "Release"
-#    ]
-#  STRATEGY_MATRIX_CMAKE_ARGS: >-
-#    [
-#      "-DUnity=OFF",
-#      "-DUnity=ON"
-#    ]
   STRATEGY_MATRIX_ARCHITECTURE: >-
     [
       {
           "platform": "linux/amd64",
           "runner": ["self-hosted", "Linux", "X64"]
+      },
+      {
+          "platform": "linux/arm64",
+          "runner": ["self-hosted", "Linux", "ARM64"]
       }
     ]
   STRATEGY_MATRIX_OS: >-
@@ -104,16 +66,54 @@ env:
             "release": "9.6",
             "compiler_name": "gcc",
             "compiler_version": "13"
-        }
+        },
+        {
+            "distro": "rhel",
+            "release": "9.6",
+            "compiler_name": "gcc",
+            "compiler_version": "14"
+        },
+        {
+            "distro": "rhel",
+            "release": "9.6",
+            "compiler_name": "clang",
+            "compiler_version": "any"
+        },
     ]
   STRATEGY_MATRIX_BUILD_TYPE: >-
     [
+      "Debug",
       "Release"
     ]
   STRATEGY_MATRIX_CMAKE_ARGS: >-
     [
+      "-DUnity=OFF",
       "-DUnity=ON"
     ]
+#  STRATEGY_MATRIX_ARCHITECTURE: >-
+#    [
+#      {
+#          "platform": "linux/amd64",
+#          "runner": ["self-hosted", "Linux", "X64"]
+#      }
+#    ]
+#  STRATEGY_MATRIX_OS: >-
+#    [
+#        {
+#            "distro": "rhel",
+#            "release": "9.6",
+#            "compiler_name": "gcc",
+#            "compiler_version": "13"
+#        }
+#    ]
+#  STRATEGY_MATRIX_BUILD_TYPE: >-
+#    [
+#      "Release"
+#    ]
+#  STRATEGY_MATRIX_CMAKE_ARGS: >-
+#    [
+#      "-DUnity=ON"
+#    ]
 
 jobs:
   # Generate the strategy matrix and expose environment variables to be used by
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index ecb9565791..0d26aa8113 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -47,77 +47,15 @@ env:
   # duplication, we define it here using environment variables and create the
   # matrix in the first job. The matrix defined below should be kept in sync
   # with https://github.com/XRPLF/ci/blob/main/.github/workflows/ubuntu.yml.
-#  STRATEGY_MATRIX_ARCHITECTURE: >-
-#    [
-#      {
-#          "platform": "linux/amd64",
-#          "runner": ["self-hosted", "Linux", "X64"]
-#      },
-#      {
-#          "platform": "linux/arm64",
-#          "runner": ["self-hosted", "Linux", "ARM64"]
-#      }
-#    ]
-#  STRATEGY_MATRIX_OS: >-
-#    [
-#        {
-#            "distro": "ubuntu",
-#            "release": "jammy",
-#            "compiler_name": "gcc",
-#            "compiler_version": "12"
-#        },
-#        {
-#            "distro": "ubuntu",
-#            "release": "noble",
-#            "compiler_name": "gcc",
-#            "compiler_version": "13"
-#        },
-#        {
-#            "distro": "ubuntu",
-#            "release": "noble",
-#            "compiler_name": "gcc",
-#            "compiler_version": "14"
-#        },
-#        {
-#            "distro": "ubuntu",
-#            "release": "noble",
-#            "compiler_name": "clang",
-#            "compiler_version": "16"
-#        },
-#        {
-#            "distro": "ubuntu",
-#            "release": "noble",
-#            "compiler_name": "clang",
-#            "compiler_version": "17"
-#        },
-#        {
-#            "distro": "ubuntu",
-#            "release": "noble",
-#            "compiler_name": "clang",
-#            "compiler_version": "18"
-#        },
-#        {
-#            "distro": "ubuntu",
-#            "release": "noble",
-#            "compiler_name": "clang",
-#            "compiler_version": "19"
-#        }
-#    ]
-#  STRATEGY_MATRIX_BUILD_TYPE: >-
-#    [
-#      "Debug",
-#      "Release"
-#    ]
-#  STRATEGY_MATRIX_CMAKE_ARGS: >-
-#    [
-#      "-DUnity=OFF",
-#      "-DUnity=ON"
-#    ]
   STRATEGY_MATRIX_ARCHITECTURE: >-
     [
       {
           "platform": "linux/amd64",
           "runner": ["self-hosted", "Linux", "X64"]
+      },
+      {
+          "platform": "linux/arm64",
+          "runner": ["self-hosted", "Linux", "ARM64"]
       }
     ]
   STRATEGY_MATRIX_OS: >-
@@ -127,16 +65,78 @@ env:
             "release": "jammy",
             "compiler_name": "gcc",
             "compiler_version": "12"
+        },
+        {
+            "distro": "ubuntu",
+            "release": "noble",
+            "compiler_name": "gcc",
+            "compiler_version": "13"
+        },
+        {
+            "distro": "ubuntu",
+            "release": "noble",
+            "compiler_name": "gcc",
+            "compiler_version": "14"
+        },
+        {
+            "distro": "ubuntu",
+            "release": "noble",
+            "compiler_name": "clang",
+            "compiler_version": "16"
+        },
+        {
+            "distro": "ubuntu",
+            "release": "noble",
+            "compiler_name": "clang",
+            "compiler_version": "17"
+        },
+        {
+            "distro": "ubuntu",
+            "release": "noble",
+            "compiler_name": "clang",
+            "compiler_version": "18"
+        },
+        {
+            "distro": "ubuntu",
+            "release": "noble",
+            "compiler_name": "clang",
+            "compiler_version": "19"
         }
     ]
   STRATEGY_MATRIX_BUILD_TYPE: >-
     [
+      "Debug",
       "Release"
     ]
   STRATEGY_MATRIX_CMAKE_ARGS: >-
     [
+      "-DUnity=OFF",
       "-DUnity=ON"
     ]
+#  STRATEGY_MATRIX_ARCHITECTURE: >-
+#    [
+#      {
+#          "platform": "linux/amd64",
+#          "runner": ["self-hosted", "Linux", "X64"]
+#      }
+#    ]
+#  STRATEGY_MATRIX_OS: >-
+#    [
+#        {
+#            "distro": "ubuntu",
+#            "release": "jammy",
+#            "compiler_name": "gcc",
+#            "compiler_version": "12"
+#        }
+#    ]
+#  STRATEGY_MATRIX_BUILD_TYPE: >-
+#    [
+#      "Release"
+#    ]
+#  STRATEGY_MATRIX_CMAKE_ARGS: >-
+#    [
+#      "-DUnity=ON"
+#    ]
 
 jobs:
   # Generate the strategy matrix and expose environment variables to be used by
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index d4882b860f..0f29efb6c9 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -46,36 +46,36 @@ env:
   # GitHub does not allow us to specify a reusable matrix strategy, so to avoid
   # duplication, we define it here using environment variables and create the
   # matrix in the first job.
-#  STRATEGY_MATRIX_ARCHITECTURE: >-
-#    [
-#      {
-#        "runner": ["self-hosted", "Windows", "X64", "devbox"]
-#      }
-#    ]
-#  STRATEGY_MATRIX_BUILD_TYPE: >-
-#    [
-#      "Debug",
-#      "Release"
-#    ]
-#  STRATEGY_MATRIX_CMAKE_ARGS: >-
-#    [
-#      "-DUnity=OFF",
-#      "-DUnity=ON"
-#    ]
   STRATEGY_MATRIX_ARCHITECTURE: >-
     [
       {
-        "runner": "windows-latest",
+        "runner": "windows-latest"
       }
     ]
   STRATEGY_MATRIX_BUILD_TYPE: >-
     [
-      "Debug"
+      "Debug",
+      "Release"
     ]
   STRATEGY_MATRIX_CMAKE_ARGS: >-
     [
+      "-DUnity=OFF",
       "-DUnity=ON"
     ]
+#  STRATEGY_MATRIX_ARCHITECTURE: >-
+#    [
+#      {
+#        "runner": "windows-latest"
+#      }
+#    ]
+#  STRATEGY_MATRIX_BUILD_TYPE: >-
+#    [
+#      "Debug"
+#    ]
+#  STRATEGY_MATRIX_CMAKE_ARGS: >-
+#    [
+#      "-DUnity=ON"
+#    ]
 
 jobs:
   # Generate the strategy matrix and expose environment variables to be used by