diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 2b2e4eb38b..f039ba7c55 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -45,18 +45,32 @@ on:
         default: false
 
 jobs:
+  construct-matrix:
+    name: Construct Benchmarks matrix
+    runs-on: ubuntu-latest
+    outputs:
+      benchmarks-matrix: '${{ steps.generate-matrix.outputs.benchmarks-matrix }}'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - id: generate-matrix
+        run: echo "benchmarks-matrix=$(./scripts/generate_matrix.sh)" >> "$GITHUB_OUTPUT"
+        env:
+          MATRIX_LINUX_COMMAND: "swift package --package-path ${{ inputs.benchmark_package_path }} ${{ inputs.swift_package_arguments }} benchmark baseline check --check-absolute-path ${{ inputs.benchmark_package_path }}/Thresholds/${SWIFT_VERSION}/"
+          MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev"
+          MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
+          MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
+          MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
+
   benchmarks:
     name: Benchmarks
+    needs: construct-matrix
     # Workaround https://github.com/nektos/act/issues/1875
-    uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
+    uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@matrix_file  # TODO: replace with @main
     with:
       name: "Benchmarks"
-      matrix_linux_command: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev && swift package --package-path ${{ inputs.benchmark_package_path }} ${{ inputs.swift_package_arguments }} benchmark baseline check --check-absolute-path ${{ inputs.benchmark_package_path }}/Thresholds/${SWIFT_VERSION}/"
-      matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
-      matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
-      matrix_linux_6_0_enabled: ${{ inputs.linux_6_0_enabled }}
-      matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
-      matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
-      matrix_windows_6_0_enabled: ${{ inputs.windows_6_0_enabled }}
-      matrix_windows_nightly_6_0_enabled: ${{ inputs.windows_nightly_6_0_enabled }}
-      matrix_windows_nightly_main_enabled: ${{ inputs.windows_nightly_main_enabled }}
+      matrix_string: '${{ needs.construct-matrix.outputs.benchmarks-matrix }}'
diff --git a/.github/workflows/cxx_interop.yml b/.github/workflows/cxx_interop.yml
index 3e66426076..545d596380 100644
--- a/.github/workflows/cxx_interop.yml
+++ b/.github/workflows/cxx_interop.yml
@@ -26,30 +26,44 @@ on:
 
       windows_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows 6.0 Swift version matrix job. Defaults to false. Currently has no effect!"  # TODO: implement Windows Cxx compat checking
         default: false
       windows_nightly_6_0_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows nightly 6.0 Swift version matrix job. Defaults to false. Currently has no effect!"  # TODO: implement Windows Cxx compat checking
         default: false
       windows_nightly_main_enabled:
         type: boolean
-        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to true."
+        description: "Boolean to enable the Windows nightly main Swift version matrix job. Defaults to false. Currently has no effect!"  # TODO: implement Windows Cxx compat checking
         default: false
 
 jobs:
+  construct-matrix:
+    name: Construct Cxx interop matrix
+    runs-on: ubuntu-latest
+    outputs:
+      cxx-interop-matrix: '${{ steps.generate-matrix.outputs.cxx-interop-matrix }}'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - id: generate-matrix
+        run: echo "cxx-interop-matrix=$(./scripts/generate_matrix.sh)" >> "$GITHUB_OUTPUT"
+        env:
+          MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
+          MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q curl jq"
+          MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
+          MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
+          MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
+
   cxx-interop:
     name: Cxx interop
+    needs: construct-matrix
     # Workaround https://github.com/nektos/act/issues/1875
-    uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
+    uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@matrix_file  # TODO: replace with @main
     with:
       name: "Cxx interop"
-      matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
-      matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
-      matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
-      matrix_linux_6_0_enabled: ${{ inputs.linux_6_0_enabled }}
-      matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
-      matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
-      matrix_windows_6_0_enabled: ${{ inputs.windows_6_0_enabled }}
-      matrix_windows_nightly_6_0_enabled: ${{ inputs.windows_nightly_6_0_enabled }}
-      matrix_windows_nightly_main_enabled: ${{ inputs.windows_nightly_main_enabled }}
+      matrix_string: '${{ needs.construct-matrix.outputs.cxx-interop-matrix }}'
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 1e5a3b7340..47aaeabf56 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -14,7 +14,7 @@ jobs:
   unit-tests:
     name: Unit tests
     # Workaround https://github.com/nektos/act/issues/1875
-    uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
+    uses: apple/swift-nio/.github/workflows/unit_tests.yml@matrix_file  # TODO: replace with @main
     with:
       linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
       linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
@@ -25,22 +25,39 @@ jobs:
   benchmarks:
     name: Benchmarks
     # Workaround https://github.com/nektos/act/issues/1875
-    uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
+    uses: apple/swift-nio/.github/workflows/benchmarks.yml@matrix_file  # TODO: replace with @main
     with:
       benchmark_package_path: "Benchmarks"
 
   cxx-interop:
     name: Cxx interop
     # Workaround https://github.com/nektos/act/issues/1875
-    uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
+    uses: apple/swift-nio/.github/workflows/cxx_interop.yml@matrix_file  # TODO: replace with @main
+
+  construct-integration-test-matrix:
+    name: Construct integration test matrix
+    runs-on: ubuntu-latest
+    outputs:
+      integration-test-matrix: '${{ steps.generate-matrix.outputs.integration-test-matrix }}'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - id: generate-matrix
+        run: echo "integration-test-matrix=$(./scripts/generate_matrix.sh)" >> "$GITHUB_OUTPUT"
+        env:
+          MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq"
+          MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh"
 
   integration-tests:
-    name: Integration Tests
+    name: Integration tests
+    needs: construct-integration-test-matrix
     # Workaround https://github.com/nektos/act/issues/1875
-    uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
+    uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@matrix_file  # TODO: replace with @main
     with:
       name: "Integration tests"
-      matrix_linux_command: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq && ./scripts/integration_tests.sh"
+      matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}'
 
   vsock-tests:
     name: Vsock tests
diff --git a/.github/workflows/swift_test_matrix.yml b/.github/workflows/swift_test_matrix.yml
new file mode 100644
index 0000000000..675bf09157
--- /dev/null
+++ b/.github/workflows/swift_test_matrix.yml
@@ -0,0 +1,93 @@
+name: Matrix
+
+on:
+  workflow_call:
+    inputs:
+      name:
+        type: string
+        description: "The name of the workflow used for the concurrency group."
+        required: true
+      matrix_path:
+        type: string
+        description: "The path of the test matrix definition."
+        default: ""
+      matrix_string:
+        type: string
+        description: "The test matrix definition."
+        default: ""
+
+# We will cancel previously triggered workflow runs
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.name }}
+  cancel-in-progress: true
+
+jobs:
+  generate-matrix:
+    name: Prepare matrices
+    runs-on: ubuntu-latest
+    outputs:
+      swift-matrix: ${{ steps.load-matrix.outputs.swift-matrix }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Mark the workspace as safe
+        # https://github.com/actions/checkout/issues/766
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      - id: load-matrix
+        run: |
+          if [ -n '${{ inputs.matrix_string }}' ]; then
+            printf "swift-matrix=%s" "$(echo '${{ inputs.matrix_string }}' | jq -c '.')" >> "$GITHUB_OUTPUT"
+          else
+            printf "swift-matrix=%s" "$(jq -c '.' ${{ inputs.matrix_path }})" >> "$GITHUB_OUTPUT"
+          fi
+
+  execute-matrix:
+    name: ${{ matrix.swift.platform }} (${{ matrix.swift.name }})
+    needs: generate-matrix
+    runs-on: ${{ matrix.swift.runner }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.generate-matrix.outputs.swift-matrix) }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: true
+      - name: Pull Docker image
+        run: docker pull ${{ matrix.swift.image }}
+      - name: Run matrix job
+        if: ${{ matrix.swift.platform != 'Windows' }}
+        run: |
+          if [[ -n "${{ matrix.swift.setup_command }}" ]]; then
+            setup_command_expression="${{ matrix.swift.setup_command }} &&"
+          else
+            setup_command_expression=""
+          fi
+          workspace="/$(basename ${{ github.workspace }})"
+          docker run -v ${{ github.workspace }}:"$workspace" \
+            -w "$workspace" \
+            -e SWIFT_VERSION="${{ matrix.swift.swift_version }}" \
+            -e setup_command_expression="$setup_command_expression" \
+            -e workspace="$workspace" \
+            ${{ matrix.swift.image }} \
+            bash -c "swift --version && git config --global --add safe.directory \"$workspace\" && $setup_command_expression ${{ matrix.swift.command }} ${{ matrix.swift.command_arguments }}"
+      - name: Run matrix job (Windows)
+        if: ${{ matrix.swift.platform == 'Windows' }}
+        run: |
+          if (-not [string]::IsNullOrEmpty("${{ matrix.swift.setup_command }}")) {
+              $setup_command_expression = "${{ matrix.swift.setup_command }} &"
+          } else {
+              $setup_command_expression = ""
+          }
+          $workspace = "C:\" + (Split-Path ${{ github.workspace }} -Leaf)
+          docker run -v ${{ github.workspace }}:$($workspace) `
+            -w $($workspace) `
+            -e SWIFT_VERSION="${{ matrix.swift.swift_version }}" `
+            -e setup_command_expression=%setup_command_expression% `
+            ${{ matrix.swift.image }} `
+            cmd /s /c  "swift --version & powershell Invoke-Expression ""$($setup_command_expression) ${{ matrix.swift.command }} ${{ matrix.swift.command_arguments }}"""
+    env:
+      SWIFT_VERSION: ${{ matrix.swift.swift_version }}
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 8a70518bb6..a0be8a1076 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -70,27 +70,43 @@ on:
         default: ""
 
 jobs:
+  construct-matrix:
+    name: Construct unit test matrix
+    runs-on: ubuntu-latest
+    outputs:
+      unit-test-matrix: '${{ steps.generate-matrix.outputs.unit-test-matrix }}'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - id: generate-matrix
+        run: echo "unit-test-matrix=$(./scripts/generate_matrix.sh)" >> "$GITHUB_OUTPUT"
+        env:
+          MATRIX_LINUX_COMMAND: "swift test"
+          MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
+          MATRIX_LINUX_5_9_COMMAND_ARGUMENTS: ${{ inputs.linux_5_9_arguments_override }}
+          MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
+          MATRIX_LINUX_5_10_COMMAND_ARGUMENTS: ${{ inputs.linux_5_10_arguments_override }}
+          MATRIX_LINUX_6_0_ENABLED: ${{ inputs.linux_6_0_enabled }}
+          MATRIX_LINUX_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_6_0_arguments_override }}
+          MATRIX_LINUX_NIGHTLY_6_0_ENABLED: ${{ inputs.linux_nightly_6_0_enabled }}
+          MATRIX_LINUX_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_6_0_arguments_override }}
+          MATRIX_LINUX_NIGHTLY_MAIN_ENABLED: ${{ inputs.linux_nightly_main_enabled }}
+          MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.linux_nightly_main_arguments_override }}
+          MATRIX_WINDOWS_COMMAND: "swift test"
+          MATRIX_WINDOWS_6_0_ENABLED: ${{ inputs.windows_6_0_enabled }}
+          MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_6_0_arguments_override }}
+          MATRIX_WINDOWS_NIGHTLY_6_0_ENABLED: ${{ inputs.windows_nightly_6_0_enabled }}
+          MATRIX_WINDOWS_NIGHTLY_6_0_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_6_0_arguments_override }}
+          MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED: ${{ inputs.windows_nightly_main_enabled }}
+          MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS: ${{ inputs.windows_nightly_main_arguments_override }}
+
   unit-tests:
     name: Unit tests
+    needs: construct-matrix
     # Workaround https://github.com/nektos/act/issues/1875
-    uses: apple/swift-nio/.github/workflows/swift_matrix.yml@main
+    uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@matrix_file  # TODO: replace with @main
     with:
       name: "Unit tests"
-      matrix_linux_command: "swift test"
-      matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
-      matrix_linux_5_9_command_override: "swift test ${{ inputs.linux_5_9_arguments_override }}"
-      matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
-      matrix_linux_5_10_command_override: "swift test ${{ inputs.linux_5_10_arguments_override }}"
-      matrix_linux_6_0_enabled: ${{ inputs.linux_6_0_enabled }}
-      matrix_linux_6_0_command_override: "swift test ${{ inputs.linux_6_0_arguments_override }}"
-      matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
-      matrix_linux_nightly_6_0_command_override: "swift test ${{ inputs.linux_nightly_6_0_arguments_override }}"
-      matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
-      matrix_linux_nightly_main_command_override: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
-      matrix_windows_command: "swift test"
-      matrix_windows_6_0_enabled: ${{ inputs.windows_6_0_enabled }}
-      matrix_windows_6_0_command_override: "swift test ${{ inputs.windows_6_0_arguments_override }}"
-      matrix_windows_nightly_6_0_enabled: ${{ inputs.windows_nightly_6_0_enabled }}
-      matrix_windows_nightly_6_0_command_override: "swift test ${{ inputs.windows_nightly_6_0_arguments_override }}"
-      matrix_windows_nightly_main_enabled: ${{ inputs.windows_nightly_main_enabled }}
-      matrix_windows_nightly_main_command_override: "swift test ${{ inputs.windows_nightly_main_arguments_override }}"
+      matrix_string: '${{ needs.construct-matrix.outputs.unit-test-matrix }}'
diff --git a/scripts/generate_matrix.sh b/scripts/generate_matrix.sh
new file mode 100755
index 0000000000..8497086a4c
--- /dev/null
+++ b/scripts/generate_matrix.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftNIO open source project
+##
+## Copyright (c) 2024 Apple Inc. and the SwiftNIO project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.txt for the list of SwiftNIO project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+
+# Parameters
+linux_command="$MATRIX_LINUX_COMMAND"  # required if any Linux pipeline is enabled
+linux_setup_command="$MATRIX_LINUX_SETUP_COMMAND"
+linux_5_9_enabled="${MATRIX_LINUX_5_9_ENABLED:=true}"
+linux_5_9_command_arguments="$MATRIX_LINUX_5_9_COMMAND_ARGUMENTS"
+linux_5_10_enabled="${MATRIX_LINUX_5_10_ENABLED:=true}"
+linux_5_10_command_arguments="$MATRIX_LINUX_5_10_COMMAND_ARGUMENTS"
+linux_6_0_enabled="${MATRIX_LINUX_6_0_ENABLED:=true}"
+linux_6_0_command_arguments="$MATRIX_LINUX_6_0_COMMAND_ARGUMENTS"
+linux_nightly_6_0_enabled="${MATRIX_LINUX_NIGHTLY_6_0_ENABLED:=true}"
+linux_nightly_6_0_command_arguments="$MATRIX_LINUX_NIGHTLY_6_0_COMMAND_ARGUMENTS"
+linux_nightly_main_enabled="${MATRIX_LINUX_NIGHTLY_MAIN_ENABLED:=true}"
+linux_nightly_main_command_arguments="$MATRIX_LINUX_NIGHTLY_MAIN_COMMAND_ARGUMENTS"
+
+windows_command="$MATRIX_WINDOWS_COMMAND"  # required if any Windows pipeline is enabled
+windows_setup_command="$MATRIX_WINDOWS_SETUP_COMMAND"
+windows_6_0_enabled="${MATRIX_WINDOWS_6_0_ENABLED:=false}"
+windows_6_0_command_arguments="$MATRIX_WINDOWS_6_0_COMMAND_ARGUMENTS"
+windows_nightly_6_0_enabled="${MATRIX_WINDOWS_NIGHTLY_6_0_ENABLED:=false}"
+windows_nightly_6_0_command_arguments="$MATRIX_WINDOWS_NIGHTLY_6_0_COMMAND_ARGUMENTS"
+windows_nightly_main_enabled="${MATRIX_WINDOWS_NIGHTLY_MAIN_ENABLED:=false}"
+windows_nightly_main_command_arguments="$MATRIX_WINDOWS_NIGHTLY_MAIN_COMMAND_ARGUMENTS"
+
+# Defaults
+linux_runner="ubuntu-latest"
+linux_5_9_container_image="swift:5.9-jammy"
+linux_5_10_container_image="swift:5.10-jammy"
+linux_6_0_container_image="swift:6.0-jammy"
+linux_nightly_6_0_container_image="swiftlang/swift:nightly-6.0-jammy"
+linux_nightly_main_container_image="swiftlang/swift:nightly-main-jammy"
+
+windows_6_0_runner="windows-2022"
+windows_6_0_container_image="swift:6.0-windowsservercore-ltsc2022"
+windows_nightly_6_0_runner="windows-2019"
+windows_nightly_6_0_container_image="swiftlang/swift:nightly-6.0-windowsservercore-1809"
+windows_nightly_main_runner="windows-2019"
+windows_nightly_main_container_image="swiftlang/swift:nightly-main-windowsservercore-1809"
+
+# Create matrix from inputs
+matrix='{"swift": []}'
+
+## Linux
+if [[ "$linux_5_9_enabled" == "true" || "$linux_5_10_enabled" == "true" || "$linux_6_0_enabled" == "true" || \
+      "$linux_nightly_6_0_enabled" == "true" || "$linux_nightly_main_enabled" == "true" ]]; then
+      if [[ -z "$linux_command" ]]; then
+        echo "No linux command defined"; exit 1
+      fi
+fi
+
+
+if [[ "$linux_5_9_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$linux_setup_command"  \
+    --arg command "$linux_command"  \
+    --arg command_arguments "$linux_5_9_command_arguments" \
+    --arg container_image "$linux_5_9_container_image" \
+    --arg runner "$linux_runner" \
+    '.swift[.swift| length] |= . + { "name": "5.9", "image": $container_image, "swift_version": "5.9", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
+fi
+
+if [[ "$linux_5_10_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$linux_setup_command"  \
+    --arg command "$linux_command"  \
+    --arg command_arguments "$linux_5_10_command_arguments" \
+    --arg container_image "$linux_5_10_container_image" \
+    --arg runner "$linux_runner" \
+    '.swift[.swift| length] |= . + { "name": "5.10", "image": $container_image, "swift_version": "5.10", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
+fi
+
+if [[ "$linux_6_0_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$linux_setup_command"  \
+    --arg command "$linux_command"  \
+    --arg command_arguments "$linux_6_0_command_arguments" \
+    --arg container_image "$linux_6_0_container_image" \
+    --arg runner "$linux_runner" \
+    '.swift[.swift| length] |= . + { "name": "6.0", "image": $container_image, "swift_version": "6.0", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
+fi
+
+if [[ "$linux_nightly_6_0_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$linux_setup_command"  \
+    --arg command "$linux_command"  \
+    --arg command_arguments "$linux_nightly_6_0_command_arguments" \
+    --arg container_image "$linux_nightly_6_0_container_image" \
+    --arg runner "$linux_runner" \
+    '.swift[.swift| length] |= . + { "name": "nightly-6.0", "image": $container_image, "swift_version": "nightly-6.0", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
+fi
+
+if [[ "$linux_nightly_main_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$linux_setup_command"  \
+    --arg command "$linux_command"  \
+    --arg command_arguments "$linux_nightly_main_command_arguments" \
+    --arg container_image "$linux_nightly_main_container_image" \
+    --arg runner "$linux_runner" \
+    '.swift[.swift| length] |= . + { "name": "nightly-main", "image": $container_image, "swift_version": "nightly-main", "platform": "Linux", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner}')
+fi
+
+## Windows
+if [[ "$windows_6_0_enabled" == "true" || "$windows_nightly_6_0_enabled" == "true" || "$windows_nightly_main_enabled" == "true" ]]; then
+      if [[ -z "$windows_command" ]]; then
+        echo "No windows command defined"; exit 1
+      fi
+fi
+
+if [[ "$windows_6_0_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$windows_setup_command"  \
+    --arg command "$windows_command"  \
+    --arg command_arguments "$windows_6_0_command_arguments" \
+    --arg container_image "$windows_6_0_container_image" \
+    --arg runner "$windows_6_0_runner" \
+    '.swift[.swift| length] |= . + { "name": "6.0", "image": $container_image, "swift_version": "6.0", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
+fi
+
+if [[ "$windows_nightly_6_0_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$windows_setup_command"  \
+    --arg command "$windows_command"  \
+    --arg command_arguments "$windows_nightly_6_0_command_arguments" \
+    --arg container_image "$windows_nightly_6_0_container_image" \
+    --arg runner "$windows_nightly_6_0_runner" \
+    '.swift[.swift| length] |= . + { "name": "nightly-6.0", "image": $container_image, "swift_version": "nightly-6.0", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
+fi
+
+if [[ "$windows_nightly_main_enabled" == "true" ]]; then
+  matrix=$(echo "$matrix" | jq -c \
+    --arg setup_command "$windows_setup_command"  \
+    --arg command "$windows_command"  \
+    --arg command_arguments "$windows_nightly_main_command_arguments" \
+    --arg container_image "$windows_nightly_main_container_image" \
+    --arg runner "$windows_nightly_main_runner" \
+    '.swift[.swift| length] |= . + { "name": "nightly-main", "image": $container_image, "swift_version": "nightly-main", "platform": "Windows", "command": $command, "command_arguments": $command_arguments, "setup_command": $setup_command, "runner": $runner }')
+fi
+
+echo "$matrix" | jq -c
\ No newline at end of file