diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml
index 42f7f4eb6e7..3c759f76fee 100644
--- a/.github/workflows/build-deb-packages.yml
+++ b/.github/workflows/build-deb-packages.yml
@@ -16,6 +16,10 @@ on:
         required: true
         type: string
         description: The version of python to use with relenv
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
 
 jobs:
   build:
@@ -30,9 +34,6 @@ jobs:
         arch:
           - x86_64
           - aarch64
-        source:
-          - onedir
-          - src
 
     container:
       image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12
@@ -89,7 +90,7 @@ jobs:
         working-directory: pkgs/checkout/
         run: |
           tools pkg build deb --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-              matrix.source == 'onedir' &&
+              inputs.source == 'onedir' &&
               format('--onedir=salt-{0}-onedir-linux-{1}.tar.xz', inputs.salt-version, matrix.arch)
               ||
               format('--arch={0}', matrix.arch)
@@ -102,7 +103,7 @@ jobs:
       - name: Set Artifact Name
         id: set-artifact-name
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb" >> "$GITHUB_OUTPUT"
           else
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb-from-src" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/build-macos-packages.yml b/.github/workflows/build-macos-packages.yml
index 25442f665f6..22c0684a398 100644
--- a/.github/workflows/build-macos-packages.yml
+++ b/.github/workflows/build-macos-packages.yml
@@ -24,6 +24,10 @@ on:
         type: string
         description: The GitHub Environment where this workflow should run
         default: ci
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
 
 jobs:
 
@@ -35,9 +39,6 @@ jobs:
       matrix:
         arch:
           - x86_64
-        source:
-          - onedir
-          - src
 
     runs-on:
       - macos-12
@@ -114,7 +115,7 @@ jobs:
           APP_SPEC_PWD: "${{ secrets.MAC_SIGN_APP_SPEC_PWD }}"
         run: |
           tools pkg build macos --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-              matrix.source == 'onedir' &&
+              inputs.source == 'onedir' &&
               format(
                 '--onedir salt-{0}-onedir-darwin-{1}.tar.xz --salt-version {0} {2}',
                 inputs.salt-version,
@@ -128,7 +129,7 @@ jobs:
       - name: Set Artifact Name
         id: set-artifact-name
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-macos" >> "$GITHUB_OUTPUT"
           else
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-macos-from-src" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml
index c9ef9cc8abe..f91a7cacd4e 100644
--- a/.github/workflows/build-rpm-packages.yml
+++ b/.github/workflows/build-rpm-packages.yml
@@ -16,6 +16,10 @@ on:
         required: true
         type: string
         description: The version of python to use with relenv
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
 
 env:
   COLUMNS: 190
@@ -33,9 +37,6 @@ jobs:
         arch:
           - x86_64
           - aarch64
-        source:
-          - onedir
-          - src
 
     container:
       image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9
@@ -77,7 +78,7 @@ jobs:
       - name: Build RPM
         run: |
           tools pkg build rpm  --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-              matrix.source == 'onedir' &&
+              inputs.source == 'onedir' &&
               format('--onedir=salt-{0}-onedir-linux-{1}.tar.xz', inputs.salt-version, matrix.arch)
               ||
               format('--arch={0}', matrix.arch)
@@ -86,7 +87,7 @@ jobs:
       - name: Set Artifact Name
         id: set-artifact-name
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm" >> "$GITHUB_OUTPUT"
           else
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm-from-src" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/build-windows-packages.yml b/.github/workflows/build-windows-packages.yml
index 8b3173fe415..522966a6b4d 100644
--- a/.github/workflows/build-windows-packages.yml
+++ b/.github/workflows/build-windows-packages.yml
@@ -24,6 +24,10 @@ on:
         type: string
         description: The GitHub Environment where this workflow should run
         default: ci
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
 
 jobs:
 
@@ -37,9 +41,6 @@ jobs:
         arch:
           - x86
           - amd64
-        source:
-          - onedir
-          - src
 
     runs-on:
       - windows-latest
@@ -108,7 +109,7 @@ jobs:
       - name: Build Windows Packages
         run: |
           tools pkg build windows --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-            matrix.source == 'onedir' &&
+            inputs.source == 'onedir' &&
             format(
               '--onedir salt-{0}-onedir-windows-{1}.zip --salt-version {0} --arch {1} {2}',
               inputs.salt-version,
@@ -123,7 +124,7 @@ jobs:
         id: set-artifact-name
         shell: bash
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name-nsis=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-NSIS" >> "$GITHUB_OUTPUT"
             echo "artifact-name-msi=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-MSI" >> "$GITHUB_OUTPUT"
           else
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0cea99f036d..5b7c2c399f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -461,8 +461,8 @@ jobs:
       relenv-version: "0.13.11"
       python-version: "3.10.13"
 
-  build-rpm-pkgs:
-    name: Build RPM Packages
+  build-rpm-pkgs-onedir:
+    name: Build RPM Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -472,9 +472,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-deb-pkgs:
-    name: Build DEB Packages
+  build-rpm-pkgs-src:
+    name: Build RPM Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-rpm-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-deb-pkgs-onedir:
+    name: Build DEB Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -484,9 +498,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-windows-pkgs:
-    name: Build Windows Packages
+  build-deb-pkgs-src:
+    name: Build DEB Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-deb-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-windows-pkgs-onedir:
+    name: Build Windows Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -496,9 +524,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-macos-pkgs:
-    name: Build macOS Packages
+  build-windows-pkgs-src:
+    name: Build Windows Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-windows-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-macos-pkgs-onedir:
+    name: Build macOS Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -508,13 +550,27 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
+
+  build-macos-pkgs-src:
+    name: Build macOS Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-macos-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
 
   amazonlinux-2-pkg-tests:
     name: Amazon Linux 2 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: amazonlinux-2
@@ -534,7 +590,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centos-7
@@ -554,7 +610,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-8
@@ -574,7 +630,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-9
@@ -594,7 +650,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-10
@@ -614,7 +670,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11
@@ -634,7 +690,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11-arm64
@@ -654,7 +710,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-3
@@ -674,7 +730,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4
@@ -694,7 +750,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4-arm64
@@ -714,7 +770,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04
@@ -734,7 +790,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04-arm64
@@ -754,7 +810,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04
@@ -774,7 +830,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04-arm64
@@ -794,7 +850,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
       distro-slug: macos-12
@@ -814,7 +870,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -834,7 +890,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -854,7 +910,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -874,7 +930,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -894,7 +950,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
@@ -914,7 +970,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 439bcb1a74b..fa17282a6c1 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -510,8 +510,8 @@ jobs:
       relenv-version: "0.13.11"
       python-version: "3.10.13"
 
-  build-rpm-pkgs:
-    name: Build RPM Packages
+  build-rpm-pkgs-onedir:
+    name: Build RPM Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -521,9 +521,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-deb-pkgs:
-    name: Build DEB Packages
+  build-rpm-pkgs-src:
+    name: Build RPM Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-rpm-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-deb-pkgs-onedir:
+    name: Build DEB Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -533,9 +547,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-windows-pkgs:
-    name: Build Windows Packages
+  build-deb-pkgs-src:
+    name: Build DEB Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-deb-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-windows-pkgs-onedir:
+    name: Build Windows Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -545,12 +573,29 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
       environment: nightly
       sign-packages: false
     secrets: inherit
 
-  build-macos-pkgs:
-    name: Build macOS Packages
+  build-windows-pkgs-src:
+    name: Build Windows Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-windows-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+      environment: nightly
+      sign-packages: false
+    secrets: inherit
+
+  build-macos-pkgs-onedir:
+    name: Build macOS Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -560,6 +605,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
+      environment: nightly
+      sign-packages: true
+    secrets: inherit
+
+  build-macos-pkgs-src:
+    name: Build macOS Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-macos-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
       environment: nightly
       sign-packages: true
     secrets: inherit
@@ -569,7 +631,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: amazonlinux-2
@@ -589,7 +651,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centos-7
@@ -609,7 +671,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-8
@@ -629,7 +691,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-9
@@ -649,7 +711,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-10
@@ -669,7 +731,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11
@@ -689,7 +751,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11-arm64
@@ -709,7 +771,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-3
@@ -729,7 +791,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4
@@ -749,7 +811,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4-arm64
@@ -769,7 +831,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04
@@ -789,7 +851,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04-arm64
@@ -809,7 +871,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04
@@ -829,7 +891,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04-arm64
@@ -849,7 +911,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
       distro-slug: macos-12
@@ -869,7 +931,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -889,7 +951,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -909,7 +971,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -929,7 +991,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -949,7 +1011,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
@@ -969,7 +1031,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
@@ -1610,7 +1672,7 @@ jobs:
       - repo-nightly
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -1721,7 +1783,7 @@ jobs:
       - repo-nightly
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -1865,7 +1927,7 @@ jobs:
       - repo-nightly
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     steps:
       - uses: actions/checkout@v3
 
@@ -1959,7 +2021,7 @@ jobs:
       - repo-nightly
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index 02863403cfe..0dda9405bd7 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -495,8 +495,8 @@ jobs:
       relenv-version: "0.13.11"
       python-version: "3.10.13"
 
-  build-rpm-pkgs:
-    name: Build RPM Packages
+  build-rpm-pkgs-onedir:
+    name: Build RPM Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -506,9 +506,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-deb-pkgs:
-    name: Build DEB Packages
+  build-rpm-pkgs-src:
+    name: Build RPM Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-rpm-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-deb-pkgs-onedir:
+    name: Build DEB Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -518,9 +532,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-windows-pkgs:
-    name: Build Windows Packages
+  build-deb-pkgs-src:
+    name: Build DEB Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-deb-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-windows-pkgs-onedir:
+    name: Build Windows Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -530,9 +558,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-macos-pkgs:
-    name: Build macOS Packages
+  build-windows-pkgs-src:
+    name: Build Windows Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-windows-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-macos-pkgs-onedir:
+    name: Build macOS Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -542,13 +584,27 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
+
+  build-macos-pkgs-src:
+    name: Build macOS Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-macos-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
 
   amazonlinux-2-pkg-tests:
     name: Amazon Linux 2 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: amazonlinux-2
@@ -568,7 +624,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centos-7
@@ -588,7 +644,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-8
@@ -608,7 +664,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-9
@@ -628,7 +684,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-10
@@ -648,7 +704,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11
@@ -668,7 +724,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11-arm64
@@ -688,7 +744,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-3
@@ -708,7 +764,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4
@@ -728,7 +784,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4-arm64
@@ -748,7 +804,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04
@@ -768,7 +824,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04-arm64
@@ -788,7 +844,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04
@@ -808,7 +864,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04-arm64
@@ -828,7 +884,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
       distro-slug: macos-12
@@ -848,7 +904,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -868,7 +924,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -888,7 +944,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -908,7 +964,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -928,7 +984,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
@@ -948,7 +1004,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index d1c4ff26ca4..3d8dd855c3a 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -505,8 +505,8 @@ jobs:
       relenv-version: "0.13.11"
       python-version: "3.10.13"
 
-  build-rpm-pkgs:
-    name: Build RPM Packages
+  build-rpm-pkgs-onedir:
+    name: Build RPM Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -516,9 +516,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-deb-pkgs:
-    name: Build DEB Packages
+  build-rpm-pkgs-src:
+    name: Build RPM Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-rpm-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-deb-pkgs-onedir:
+    name: Build DEB Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
@@ -528,9 +542,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
 
-  build-windows-pkgs:
-    name: Build Windows Packages
+  build-deb-pkgs-src:
+    name: Build DEB Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-deb-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+
+  build-windows-pkgs-onedir:
+    name: Build Windows Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -540,12 +568,29 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
       environment: staging
       sign-packages: ${{ inputs.sign-windows-packages }}
     secrets: inherit
 
-  build-macos-pkgs:
-    name: Build macOS Packages
+  build-windows-pkgs-src:
+    name: Build Windows Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-windows-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
+      environment: staging
+      sign-packages: ${{ inputs.sign-windows-packages }}
+    secrets: inherit
+
+  build-macos-pkgs-onedir:
+    name: Build macOS Packages (onedir)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
@@ -555,6 +600,23 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.13.11"
       python-version: "3.10.13"
+      source: "onedir"
+      environment: staging
+      sign-packages: true
+    secrets: inherit
+
+  build-macos-pkgs-src:
+    name: Build macOS Packages (src)
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-macos-packages.yml
+    with:
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      relenv-version: "0.13.11"
+      python-version: "3.10.13"
+      source: "src"
       environment: staging
       sign-packages: true
     secrets: inherit
@@ -564,7 +626,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: amazonlinux-2
@@ -584,7 +646,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centos-7
@@ -604,7 +666,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-8
@@ -624,7 +686,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: centosstream-9
@@ -644,7 +706,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-10
@@ -664,7 +726,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11
@@ -684,7 +746,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: debian-11-arm64
@@ -704,7 +766,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-3
@@ -724,7 +786,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4
@@ -744,7 +806,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: photonos-4-arm64
@@ -764,7 +826,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04
@@ -784,7 +846,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-20.04-arm64
@@ -804,7 +866,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04
@@ -824,7 +886,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: ubuntu-22.04-arm64
@@ -844,7 +906,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
       distro-slug: macos-12
@@ -864,7 +926,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -884,7 +946,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2016
@@ -904,7 +966,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -924,7 +986,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2019
@@ -944,7 +1006,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
@@ -964,7 +1026,7 @@ jobs:
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: windows-2022
@@ -1536,7 +1598,7 @@ jobs:
       - repo-staging
     needs:
       - prepare-workflow
-      - build-deb-pkgs
+      - build-deb-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -1647,7 +1709,7 @@ jobs:
       - repo-staging
     needs:
       - prepare-workflow
-      - build-rpm-pkgs
+      - build-rpm-pkgs-onedir
     strategy:
       fail-fast: false
       matrix:
@@ -1793,7 +1855,7 @@ jobs:
       - repo-staging
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     steps:
       - uses: actions/checkout@v3
 
@@ -1887,7 +1949,7 @@ jobs:
       - repo-staging
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja
index eb0df9b14de..7c33f9e217f 100644
--- a/.github/workflows/templates/build-packages.yml.jinja
+++ b/.github/workflows/templates/build-packages.yml.jinja
@@ -5,10 +5,11 @@
                                                   ("macos", "macOS", "github-hosted"),
                                                 ) %>
 
-  <%- set job_name = "build-{}-pkgs".format(pkg_type) %>
+  <%- for backend in ("onedir", "src") %>
+  <%- set job_name = "build-{}-pkgs-{}".format(pkg_type, backend) %>
 
   <{ job_name }>:
-    name: Build <{ display_name }> Packages
+    name: Build <{ display_name }> Packages (<{ backend }>)
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['<{ runner_type }>'] }}
     needs:
       - prepare-workflow
@@ -18,6 +19,7 @@
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "<{ relenv_version }>"
       python-version: "<{ python_version }>"
+      source: "<{ backend }>"
     <%- if pkg_type in ("macos", "windows") and gh_environment %>
       environment: <{ gh_environment }>
       <%- if pkg_type == "macos" %>
@@ -28,4 +30,5 @@
     secrets: inherit
     <%- endif %>
 
+  <%- endfor %>
 <%- endfor %>
diff --git a/.github/workflows/templates/build-repos.yml.jinja b/.github/workflows/templates/build-repos.yml.jinja
index 85cea3e38db..de984ed75de 100644
--- a/.github/workflows/templates/build-repos.yml.jinja
+++ b/.github/workflows/templates/build-repos.yml.jinja
@@ -20,7 +20,7 @@
     needs:
       - prepare-workflow
       <%- if needs_pkg %>
-      - build-<{ type }>-pkgs
+      - build-<{ type }>-pkgs-onedir
       <%- else %>
       - build-salt-onedir
       <%- endif %>
diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja
index b1f446c7e2f..4393f954c34 100644
--- a/.github/workflows/templates/test-salt-pkg.yml.jinja
+++ b/.github/workflows/templates/test-salt-pkg.yml.jinja
@@ -43,7 +43,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-<{ pkg_type }>-pkgs
+      - build-<{ pkg_type }>-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: <{ slug }>
@@ -71,7 +71,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
       distro-slug: <{ slug }>
@@ -101,7 +101,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: <{ slug }>