diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml
index 7b7adbd5f70..79a34e93469 100644
--- a/.github/workflows/build-salt-onedir.yml
+++ b/.github/workflows/build-salt-onedir.yml
@@ -20,10 +20,10 @@ on:
         required: true
         type: string
         description: The version of python to use with relenv
-      kind:
+      matrix:
         type: string
         required: true
-        description: The kind of tests to run windows, macos, or linux
+        description: Json config for build matrix
 
 env:
   RELENV_DATA: "${{ github.workspace }}/.relenv"
@@ -37,49 +37,17 @@ env:
 
 jobs:
 
-  generate-matrix:
-    name: Test Matrix (${{ inputs.kind }})
-    runs-on: ubuntu-latest
-    outputs:
-      matrix-include: ${{ steps.generate-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.10.14"
-
-      - name: "Throttle Builds"
-        shell: bash
-        run: |
-          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
-
-      - name: Checkout Source Code
-        uses: actions/checkout@v4
-
-      - name: Setup Python Tools Scripts
-        uses: ./.github/actions/setup-python-tools-scripts
-        with:
-          cache-prefix: ${{ inputs.cache-seed }}
-        env:
-          PIP_INDEX_URL: https://pypi.org/simple
-
-      - name: Generate Test Matrix
-        id: generate-matrix
-        run: tools ci build-matrix ${{ inputs.kind }}
-
 
   build-salt-linux:
     name: Linux
-    if: ${{ inputs.kind  == 'linux' }}
     env:
       USE_S3_CACHE: 'false'
     runs-on:
       - ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
-    needs:
-      - generate-matrix
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }}
+        include: ${{ fromJSON(inputs.matrix)['linux'] }}
     steps:
 
       - name: "Throttle Builds"
@@ -121,14 +89,11 @@ jobs:
 
   build-salt-macos:
     name: macOS
-    if: ${{ inputs.kind  == 'macos' }}
-    needs:
-      - generate-matrix
     strategy:
       fail-fast: false
       max-parallel: 2
       matrix:
-        include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }}
+        include: ${{ fromJSON(inputs.matrix)['macos'] }}
     runs-on:
       - ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-13' }}
     env:
@@ -182,14 +147,11 @@ jobs:
 
   build-salt-windows:
     name: Windows
-    if: ${{ inputs.kind  == 'windows' }}
     strategy:
       fail-fast: false
       max-parallel: 2
       matrix:
-        arch:
-          - x86
-          - amd64
+        include: ${{ fromJSON(inputs.matrix)['windows'] }}
     runs-on: windows-latest
     env:
       PIP_INDEX_URL: https://pypi.org/simple
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4b3cb51536..90b308310d2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -417,9 +417,9 @@ jobs:
       python-version: "3.10.15"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
-  build-salt-onedir-linux:
+  build-salt-onedir:
     name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir'] }}
     needs:
       - prepare-workflow
       - build-deps-onedir
@@ -430,44 +430,14 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.18.0"
       python-version: "3.10.15"
-      kind: linux
-
-  build-salt-onedir-macos:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: macos
-
-  build-salt-onedir-windows:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
   build-pkgs-onedir-linux:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -482,7 +452,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -497,7 +467,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -511,7 +481,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -527,7 +497,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -543,7 +513,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -2207,9 +2177,7 @@ jobs:
       - nsis-tests
       - build-docs
       - build-deps-onedir
-      - build-salt-onedir-linux
-      - build-salt-onedir-macos
-      - build-salt-onedir-windows
+      - build-salt-onedir
       - combine-all-code-coverage
       - build-ci-deps-linux
       - build-ci-deps-macos
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e78d1205a79..5a8b4bd4e61 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -471,9 +471,9 @@ jobs:
       python-version: "3.10.15"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
-  build-salt-onedir-linux:
+  build-salt-onedir:
     name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir'] }}
     needs:
       - prepare-workflow
       - build-deps-onedir
@@ -484,44 +484,14 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.18.0"
       python-version: "3.10.15"
-      kind: linux
-
-  build-salt-onedir-macos:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: macos
-
-  build-salt-onedir-windows:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
   build-pkgs-onedir-linux:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -540,7 +510,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -559,7 +529,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -578,7 +548,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -597,7 +567,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -616,7 +586,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -634,7 +604,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -650,7 +620,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -666,7 +636,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -2763,9 +2733,9 @@ jobs:
       USE_S3_CACHE: 'false'
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
-      - build-salt-onedir-macos
-      - build-salt-onedir-windows
+      - build-salt-onedir
+      - build-salt-onedir
+      - build-salt-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -2989,9 +2959,7 @@ jobs:
       - nsis-tests
       - build-docs
       - build-deps-onedir
-      - build-salt-onedir-linux
-      - build-salt-onedir-macos
-      - build-salt-onedir-windows
+      - build-salt-onedir
       - build-pkgs-src-linux
       - build-pkgs-src-macos
       - build-pkgs-src-windows
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index bc538b57310..d7347e2aae1 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -456,9 +456,9 @@ jobs:
       python-version: "3.10.15"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
-  build-salt-onedir-linux:
+  build-salt-onedir:
     name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir'] }}
     needs:
       - prepare-workflow
       - build-deps-onedir
@@ -469,44 +469,14 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.18.0"
       python-version: "3.10.15"
-      kind: linux
-
-  build-salt-onedir-macos:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: macos
-
-  build-salt-onedir-windows:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
   build-pkgs-onedir-linux:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -521,7 +491,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -536,7 +506,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -550,7 +520,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -566,7 +536,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -582,7 +552,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -2084,9 +2054,7 @@ jobs:
       - nsis-tests
       - build-docs
       - build-deps-onedir
-      - build-salt-onedir-linux
-      - build-salt-onedir-macos
-      - build-salt-onedir-windows
+      - build-salt-onedir
       - build-ci-deps-linux
       - build-ci-deps-macos
       - build-ci-deps-windows
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 4526cc28242..545d7a2bcd9 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -453,9 +453,9 @@ jobs:
       python-version: "3.10.15"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
-  build-salt-onedir-linux:
+  build-salt-onedir:
     name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir'] }}
     needs:
       - prepare-workflow
       - build-deps-onedir
@@ -466,44 +466,14 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.18.0"
       python-version: "3.10.15"
-      kind: linux
-
-  build-salt-onedir-macos:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: macos
-
-  build-salt-onedir-windows:
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
   build-pkgs-onedir-linux:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -522,7 +492,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -541,7 +511,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -560,7 +530,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -579,7 +549,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -598,7 +568,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -616,7 +586,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -632,7 +602,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -648,7 +618,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-deps-ci-action.yml
     with:
       nox-session: ci-test-onedir
@@ -2747,9 +2717,9 @@ jobs:
       USE_S3_CACHE: 'false'
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
-      - build-salt-onedir-macos
-      - build-salt-onedir-windows
+      - build-salt-onedir
+      - build-salt-onedir
+      - build-salt-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -3142,9 +3112,7 @@ jobs:
       - nsis-tests
       - build-docs
       - build-deps-onedir
-      - build-salt-onedir-linux
-      - build-salt-onedir-macos
-      - build-salt-onedir-windows
+      - build-salt-onedir
       - build-pkgs-src-linux
       - build-pkgs-src-macos
       - build-pkgs-src-windows
diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja
index f67919a9cee..b0c6d21a5e3 100644
--- a/.github/workflows/templates/build-ci-deps.yml.jinja
+++ b/.github/workflows/templates/build-ci-deps.yml.jinja
@@ -9,7 +9,7 @@
     needs:
       - prepare-workflow
     <%- if workflow_slug != 'release' %>
-      - build-salt-onedir-linux
+      - build-salt-onedir
     <%- else %>
       - download-onedir-artifact
     <%- endif %>
@@ -33,7 +33,7 @@
     needs:
       - prepare-workflow
     <%- if workflow_slug != 'release' %>
-      - build-salt-onedir-macos
+      - build-salt-onedir
     <%- else %>
       - download-onedir-artifact
     <%- endif %>
@@ -57,7 +57,7 @@
     needs:
       - prepare-workflow
     <%- if workflow_slug != 'release' %>
-      - build-salt-onedir-windows
+      - build-salt-onedir
     <%- else %>
       - download-onedir-artifact
     <%- endif %>
diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja
index 59bfea2c796..b7facef39df 100644
--- a/.github/workflows/templates/build-packages.yml.jinja
+++ b/.github/workflows/templates/build-packages.yml.jinja
@@ -14,7 +14,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-linux
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -42,7 +42,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-macos
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
@@ -70,7 +70,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir-windows
+      - build-salt-onedir
     uses: ./.github/workflows/build-packages.yml
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja
index a01a09d728c..4cbe7f2a707 100644
--- a/.github/workflows/templates/build-repos.yml.jinja
+++ b/.github/workflows/templates/build-repos.yml.jinja
@@ -26,9 +26,9 @@
       - build-pkgs-onedir-<{ type }>
         <%- endif %>
       <%- elif type == 'onedir' %>
-      - build-salt-onedir-linux
-      - build-salt-onedir-macos
-      - build-salt-onedir-windows
+      - build-salt-onedir
+      - build-salt-onedir
+      - build-salt-onedir
       <%- elif type == 'src' %>
       - build-source-tarball
       - build-pkgs-src-linux
diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
index 79e9bdbf5ab..dd43bd05368 100644
--- a/.github/workflows/templates/ci.yml.jinja
+++ b/.github/workflows/templates/ci.yml.jinja
@@ -262,7 +262,7 @@
 
   <%- endif %>
 
-  <%- set job_name = "build-salt-onedir-linux" %>
+  <%- set job_name = "build-salt-onedir" %>
   <%- if includes.get(job_name, True) %>
 
   <{ job_name }>:
@@ -279,50 +279,9 @@
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "<{ relenv_version }>"
       python-version: "<{ python_version }>"
-      kind: linux
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
 
   <%- endif %>
-  <%- set job_name = "build-salt-onedir-macos" %>
-  <%- if includes.get(job_name, True) %>
-
-  <{ job_name }>:
-    <%- do conclusion_needs.append(job_name) %>
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "<{ relenv_version }>"
-      python-version: "<{ python_version }>"
-      kind: macos
-
-  <%- endif %>
-  <%- set job_name = "build-salt-onedir-windows" %>
-  <%- if includes.get(job_name, True) %>
-
-  <{ job_name }>:
-    <%- do conclusion_needs.append(job_name) %>
-    name: Build Salt Onedir
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }}
-    needs:
-      - prepare-workflow
-      - build-deps-onedir
-      - build-source-tarball
-    uses: ./.github/workflows/build-salt-onedir.yml
-    with:
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      relenv-version: "<{ relenv_version }>"
-      python-version: "<{ python_version }>"
-      kind: windows
-
-  <%- endif %>
-
 
   <%- set job_name = "build-pkgs" %>
   <%- if includes.get(job_name, True) %>