diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 15314c09805..0c4b432c4f3 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -16,10 +16,6 @@ on:
         required: true
         type: string
         description: The version of python to use with relenv
-      kind:
-        type: string
-        required: true
-        description: The kind of tests to run windows, macos, or linux
       sign-macos-packages:
         type: boolean
         default: false
@@ -40,6 +36,10 @@ on:
         required: true
         type: string
         description: Seed used to invalidate caches
+      matrix:
+        required: true
+        type: string
+        description: Json job matrix config
 
 env:
   COLUMNS: 190
@@ -50,50 +50,16 @@ 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-prefix }}
-        env:
-          PIP_INDEX_URL: https://pypi.org/simple
-
-      - name: Generate Test Matrix
-        id: generate-matrix
-        run: tools ci build-matrix ${{ inputs.kind }}
-
-
-
   build-deb-packages:
     name: DEB
-    if: ${{ inputs.kind  == 'linux' }}
     runs-on:
       - ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
-    needs:
-      - generate-matrix
     strategy:
       fail-fast: false
       matrix:
         source:
           - ${{ inputs.source }}
-        include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }}
+        include: ${{ fromJSON(inputs.matrix)['linux'] }}
 
     container:
       image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12
@@ -180,17 +146,14 @@ jobs:
 
   build-rpm-packages:
     name: RPM
-    if: ${{ inputs.kind  == 'linux' }}
     runs-on:
       - ${{ matrix.arch == 'x86_64' && 'ubuntu-latest' || 'linux-arm64' }}
-    needs:
-      - generate-matrix
     strategy:
       fail-fast: false
       matrix:
         source:
           - ${{ inputs.source }}
-        include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }}
+        include: ${{ fromJSON(inputs.matrix)['linux'] }}
 
     container:
       image: ghcr.io/saltstack/salt-ci-containers/packaging:rockylinux-9
@@ -259,16 +222,13 @@ jobs:
 
   build-macos-pkgs:
     name: macOS
-    needs:
-      - generate-matrix
     environment: ${{ inputs.environment }}
-    if: ${{ inputs.kind  == 'macos' }}
     strategy:
       fail-fast: false
       matrix:
         source:
           - ${{ inputs.source }}
-        include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }}
+        include: ${{ fromJSON(inputs.matrix)['macos'] }}
     env:
       PIP_INDEX_URL: https://pypi.org/simple
     runs-on:
@@ -379,19 +339,13 @@ jobs:
   build-windows-pkgs:
     name: Windows
     environment: ${{ inputs.environment }}
-    needs:
-      - generate-matrix
-    if: ${{ inputs.kind  == 'windows' }}
     strategy:
       fail-fast: false
       max-parallel: 2
       matrix:
-        arch:
-          - x86
-          - amd64
         source:
           - ${{ inputs.source }}
-
+        include: ${{ fromJSON(inputs.matrix)['windows'] }}
     runs-on:
       - windows-latest
     env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90b308310d2..c346a16dd02 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -432,22 +432,7 @@ jobs:
       python-version: "3.10.15"
       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
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: linux
-      source: "onedir"
-
-  build-pkgs-onedir-macos:
+  build-pkgs-onedir:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
@@ -460,22 +445,7 @@ jobs:
       relenv-version: "0.18.0"
       python-version: "3.10.15"
       source: "onedir"
-      kind: macos
-
-  build-pkgs-onedir-windows:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      source: "onedir"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
   build-ci-deps-linux:
     name: CI Deps
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
@@ -529,7 +499,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -551,7 +521,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -573,7 +543,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -595,7 +565,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -617,7 +587,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -639,7 +609,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -661,7 +631,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -683,7 +653,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -705,7 +675,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -727,7 +697,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -749,7 +719,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -771,7 +741,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -793,7 +763,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -815,7 +785,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -837,7 +807,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -860,7 +830,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -883,7 +853,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -905,7 +875,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -927,7 +897,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -950,7 +920,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -973,7 +943,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -995,7 +965,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1017,7 +987,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1039,7 +1009,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1061,7 +1031,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1083,7 +1053,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1105,7 +1075,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1127,7 +1097,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-13'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1149,7 +1119,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-14'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1171,7 +1141,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-15'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1193,7 +1163,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1214,7 +1184,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1235,7 +1205,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1256,7 +1226,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5a8b4bd4e61..311e12e9cba 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -486,45 +486,7 @@ jobs:
       python-version: "3.10.15"
       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
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: linux
-      source: "onedir"
-      environment: nightly
-      sign-macos-packages: false
-      sign-windows-packages: false
-    secrets: inherit
-
-  build-pkgs-src-linux:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: linux
-      source: "src"
-      environment: nightly
-      sign-macos-packages: false
-      sign-windows-packages: false
-    secrets: inherit
-
-  build-pkgs-onedir-macos:
+  build-pkgs-onedir:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
@@ -537,13 +499,13 @@ jobs:
       relenv-version: "0.18.0"
       python-version: "3.10.15"
       source: "onedir"
-      kind: macos
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       environment: nightly
       sign-macos-packages: false
       sign-windows-packages: false
     secrets: inherit
 
-  build-pkgs-src-macos:
+  build-pkgs-src:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
@@ -556,45 +518,7 @@ jobs:
       relenv-version: "0.18.0"
       python-version: "3.10.15"
       source: "src"
-      kind: macos
-      environment: nightly
-      sign-macos-packages: false
-      sign-windows-packages: false
-    secrets: inherit
-
-  build-pkgs-onedir-windows:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      source: "onedir"
-      kind: windows
-      environment: nightly
-      sign-macos-packages: false
-      sign-windows-packages: false
-    secrets: inherit
-
-  build-pkgs-src-windows:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      source: "src"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       environment: nightly
       sign-macos-packages: false
       sign-windows-packages: false
@@ -652,7 +576,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -674,7 +598,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -696,7 +620,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -718,7 +642,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -740,7 +664,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -762,7 +686,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -784,7 +708,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -806,7 +730,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -828,7 +752,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -850,7 +774,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -872,7 +796,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -894,7 +818,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -916,7 +840,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -938,7 +862,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -960,7 +884,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -983,7 +907,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1006,7 +930,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1028,7 +952,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1050,7 +974,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1073,7 +997,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1096,7 +1020,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1118,7 +1042,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1140,7 +1064,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1162,7 +1086,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1184,7 +1108,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1206,7 +1130,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1228,7 +1152,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1250,7 +1174,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-13'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1272,7 +1196,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-14'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1294,7 +1218,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-15'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1316,7 +1240,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1337,7 +1261,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1358,7 +1282,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1379,7 +1303,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -2133,9 +2057,7 @@ jobs:
     needs:
       - prepare-workflow
       - build-source-tarball
-      - build-pkgs-src-linux
-      - build-pkgs-src-macos
-      - build-pkgs-src-windows
+      - build-pkgs-src
     strategy:
       fail-fast: false
       matrix:
@@ -2235,7 +2157,7 @@ jobs:
       USE_S3_CACHE: 'false'
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -2364,7 +2286,7 @@ jobs:
       USE_S3_CACHE: 'false'
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -2734,8 +2656,6 @@ jobs:
     needs:
       - prepare-workflow
       - build-salt-onedir
-      - build-salt-onedir
-      - build-salt-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -2960,9 +2880,8 @@ jobs:
       - build-docs
       - build-deps-onedir
       - build-salt-onedir
-      - build-pkgs-src-linux
+      - build-pkgs-src
       - build-pkgs-src-macos
-      - build-pkgs-src-windows
       - publish-repositories
       - test-pkg-rockylinux-8
       - test-pkg-rockylinux-8-arm64
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index d7347e2aae1..7cd70a44315 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -471,22 +471,7 @@ jobs:
       python-version: "3.10.15"
       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
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: linux
-      source: "onedir"
-
-  build-pkgs-onedir-macos:
+  build-pkgs-onedir:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
@@ -499,22 +484,7 @@ jobs:
       relenv-version: "0.18.0"
       python-version: "3.10.15"
       source: "onedir"
-      kind: macos
-
-  build-pkgs-onedir-windows:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      source: "onedir"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
   build-ci-deps-linux:
     name: CI Deps
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] }}
@@ -568,7 +538,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -590,7 +560,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -612,7 +582,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -634,7 +604,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -656,7 +626,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -678,7 +648,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -700,7 +670,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -722,7 +692,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -744,7 +714,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -766,7 +736,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -788,7 +758,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -810,7 +780,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -832,7 +802,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -854,7 +824,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -876,7 +846,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -899,7 +869,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -922,7 +892,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -944,7 +914,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -966,7 +936,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -989,7 +959,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1012,7 +982,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1034,7 +1004,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1056,7 +1026,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1078,7 +1048,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1100,7 +1070,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1122,7 +1092,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1144,7 +1114,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1166,7 +1136,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-13'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1188,7 +1158,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-14'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1210,7 +1180,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-15'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1232,7 +1202,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1253,7 +1223,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1274,7 +1244,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1295,7 +1265,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 545d7a2bcd9..1dd9248a3cb 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -468,45 +468,7 @@ jobs:
       python-version: "3.10.15"
       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
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: linux
-      source: "onedir"
-      environment: staging
-      sign-macos-packages: false
-      sign-windows-packages: ${{ inputs.sign-windows-packages }}
-    secrets: inherit
-
-  build-pkgs-src-linux:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      kind: linux
-      source: "src"
-      environment: staging
-      sign-macos-packages: false
-      sign-windows-packages: ${{ inputs.sign-windows-packages }}
-    secrets: inherit
-
-  build-pkgs-onedir-macos:
+  build-pkgs-onedir:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
@@ -519,13 +481,13 @@ jobs:
       relenv-version: "0.18.0"
       python-version: "3.10.15"
       source: "onedir"
-      kind: macos
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       environment: staging
       sign-macos-packages: false
       sign-windows-packages: ${{ inputs.sign-windows-packages }}
     secrets: inherit
 
-  build-pkgs-src-macos:
+  build-pkgs-src:
     name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
     needs:
@@ -538,45 +500,7 @@ jobs:
       relenv-version: "0.18.0"
       python-version: "3.10.15"
       source: "src"
-      kind: macos
-      environment: staging
-      sign-macos-packages: false
-      sign-windows-packages: ${{ inputs.sign-windows-packages }}
-    secrets: inherit
-
-  build-pkgs-onedir-windows:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      source: "onedir"
-      kind: windows
-      environment: staging
-      sign-macos-packages: false
-      sign-windows-packages: ${{ inputs.sign-windows-packages }}
-    secrets: inherit
-
-  build-pkgs-src-windows:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.18.0"
-      python-version: "3.10.15"
-      source: "src"
-      kind: windows
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       environment: staging
       sign-macos-packages: false
       sign-windows-packages: ${{ inputs.sign-windows-packages }}
@@ -634,7 +558,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -656,7 +580,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -678,7 +602,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -700,7 +624,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -722,7 +646,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -744,7 +668,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -766,7 +690,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -788,7 +712,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -810,7 +734,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -832,7 +756,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -854,7 +778,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -876,7 +800,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -898,7 +822,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -920,7 +844,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -942,7 +866,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -965,7 +889,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -988,7 +912,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1010,7 +934,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1032,7 +956,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1055,7 +979,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1078,7 +1002,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1100,7 +1024,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1122,7 +1046,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1144,7 +1068,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1166,7 +1090,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1188,7 +1112,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -1210,7 +1134,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-12'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1232,7 +1156,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-13'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1254,7 +1178,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-14'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1276,7 +1200,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-macos-15'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -1298,7 +1222,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1319,7 +1243,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2019-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1340,7 +1264,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-nsis'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -1361,7 +1285,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-windows-2022-msi'] }}
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with:
@@ -2115,9 +2039,7 @@ jobs:
     needs:
       - prepare-workflow
       - build-source-tarball
-      - build-pkgs-src-linux
-      - build-pkgs-src-macos
-      - build-pkgs-src-windows
+      - build-pkgs-src
     strategy:
       fail-fast: false
       matrix:
@@ -2217,7 +2139,7 @@ jobs:
       USE_S3_CACHE: 'false'
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -2346,7 +2268,7 @@ jobs:
       USE_S3_CACHE: 'false'
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -2718,8 +2640,6 @@ jobs:
     needs:
       - prepare-workflow
       - build-salt-onedir
-      - build-salt-onedir
-      - build-salt-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -3113,9 +3033,8 @@ jobs:
       - build-docs
       - build-deps-onedir
       - build-salt-onedir
-      - build-pkgs-src-linux
+      - build-pkgs-src
       - build-pkgs-src-macos
-      - build-pkgs-src-windows
       - publish-repositories
       - upload-release-artifacts
       - pkg-download-tests
diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja
index b7facef39df..ebc8d86179e 100644
--- a/.github/workflows/templates/build-packages.yml.jinja
+++ b/.github/workflows/templates/build-packages.yml.jinja
@@ -4,7 +4,7 @@
 <%- set pkg_types = ("onedir",) %>
 <%- endif -%>
   <%- for backend in pkg_types %>
-  <%- set job_name = "build-pkgs-{}-linux".format(backend) %>
+  <%- set job_name = "build-pkgs-{}".format(backend) %>
   <%- if backend == "src" %>
     <%- do conclusion_needs.append(job_name) %>
   <%- endif %>
@@ -21,13 +21,14 @@
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "<{ relenv_version }>"
       python-version: "<{ python_version }>"
-      kind: linux
       source: "<{ backend }>"
+      matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
     <%- if gh_environment != "ci" %>
       environment: <{ gh_environment }>
       sign-macos-packages: false
       sign-windows-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-windows-packages }} <%- endif %>
     secrets: inherit
+
     <%- endif %>
 
   <%- endfor %>
@@ -37,53 +38,4 @@
     <%- do conclusion_needs.append(job_name) %>
   <%- endif %>
 
-  <{ job_name }>:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "<{ relenv_version }>"
-      python-version: "<{ python_version }>"
-      source: "<{ backend }>"
-      kind: macos
-    <%- if gh_environment != "ci" %>
-      environment: <{ gh_environment }>
-      sign-macos-packages: false
-      sign-windows-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-windows-packages }} <%- endif %>
-    secrets: inherit
-    <%- endif %>
-
-  <%- endfor %>
-  <%- for backend in pkg_types %>
-  <%- set job_name = "build-pkgs-{}-windows".format(backend) %>
-  <%- if backend == "src" %>
-    <%- do conclusion_needs.append(job_name) %>
-  <%- endif %>
-
-  <{ job_name }>:
-    name: Build Packages
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] }}
-    needs:
-      - prepare-workflow
-      - build-salt-onedir
-    uses: ./.github/workflows/build-packages.yml
-    with:
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "<{ relenv_version }>"
-      python-version: "<{ python_version }>"
-      source: "<{ backend }>"
-      kind: windows
-    <%- if gh_environment != "ci" %>
-      environment: <{ gh_environment }>
-      sign-macos-packages: false
-      sign-windows-packages: <% if gh_environment == 'nightly' -%> false <%- else -%> ${{ inputs.sign-windows-packages }} <%- endif %>
-    secrets: inherit
-    <%- endif %>
-
   <%- endfor %>
diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja
index 4cbe7f2a707..912e7421eb4 100644
--- a/.github/workflows/templates/build-repos.yml.jinja
+++ b/.github/workflows/templates/build-repos.yml.jinja
@@ -21,19 +21,15 @@
       - prepare-workflow
       <%- if type not in ("src", "onedir") %>
 	<%- if type in ("deb", "rpm") %>
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
         <%- else %>
       - build-pkgs-onedir-<{ type }>
         <%- endif %>
       <%- elif type == 'onedir' %>
       - build-salt-onedir
-      - build-salt-onedir
-      - build-salt-onedir
       <%- elif type == 'src' %>
       - build-source-tarball
-      - build-pkgs-src-linux
-      - build-pkgs-src-macos
-      - build-pkgs-src-windows
+      - build-pkgs-src
       <%- endif %>
 
     <%- include "build-{}-repo.yml.jinja".format(type) %>
diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja
index a50ba2cc287..a8407cf03a0 100644
--- a/.github/workflows/templates/test-salt-pkg.yml.jinja
+++ b/.github/workflows/templates/test-salt-pkg.yml.jinja
@@ -11,7 +11,7 @@
     <%- endif %>
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-linux
+      - build-pkgs-onedir
       - build-ci-deps-linux
     uses: ./.github/workflows/test-packages-action-linux.yml
     with:
@@ -48,7 +48,7 @@
     <%- endif %>
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-macos
+      - build-pkgs-onedir
       - build-ci-deps-macos
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
@@ -81,7 +81,7 @@
     <%- endif %>
     needs:
       - prepare-workflow
-      - build-pkgs-onedir-windows
+      - build-pkgs-onedir
       - build-ci-deps-windows
     uses: ./.github/workflows/test-packages-action-windows.yml
     with: