diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa0b25b7817..8caae5a2ace 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-5  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-7  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
 
 permissions:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 561d6132380..cb12aca9a22 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -22,7 +22,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-5  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-7  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
 
 permissions:
@@ -3730,6 +3730,12 @@ jobs:
           name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
           path: artifacts/pkgs/incoming
 
+      - name: Download macOS arm64 Onedir Archive
+        uses: actions/download-artifact@v3
+        with:
+          name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-aarch64.tar.xz
+          path: artifacts/pkgs/incoming
+
       - name: Download Windows amd64 Onedir Archive
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5f9b99ccd27..b0752237544 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-5  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-7  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
 
 permissions:
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index 41ddb1fa172..0acc58d9a52 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-5  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-7  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
 
 permissions:
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 4c8f00a8650..3063f3eea89 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -37,7 +37,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-5  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-7  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
 
 permissions:
@@ -3541,6 +3541,12 @@ jobs:
           name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
           path: artifacts/pkgs/incoming
 
+      - name: Download macOS arm64 Onedir Archive
+        uses: actions/download-artifact@v3
+        with:
+          name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-aarch64.tar.xz
+          path: artifacts/pkgs/incoming
+
       - name: Download Windows amd64 Onedir Archive
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/templates/build-onedir-repo.yml.jinja b/.github/workflows/templates/build-onedir-repo.yml.jinja
index 9b1daf3ce7e..8e51caa9c8b 100644
--- a/.github/workflows/templates/build-onedir-repo.yml.jinja
+++ b/.github/workflows/templates/build-onedir-repo.yml.jinja
@@ -37,6 +37,12 @@
           name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-x86_64.tar.xz
           path: artifacts/pkgs/incoming
 
+      - name: Download macOS arm64 Onedir Archive
+        uses: actions/download-artifact@v3
+        with:
+          name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-onedir-darwin-aarch64.tar.xz
+          path: artifacts/pkgs/incoming
+
       - name: Download Windows amd64 Onedir Archive
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja
index aabf118607f..06e432d1191 100644
--- a/.github/workflows/templates/layout.yml.jinja
+++ b/.github/workflows/templates/layout.yml.jinja
@@ -34,7 +34,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-5  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-7  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
 
 <%- endblock env %>
diff --git a/.github/workflows/templates/test-package-downloads-action.yml.jinja b/.github/workflows/templates/test-package-downloads-action.yml.jinja
index ce608ce98bb..4f9502d7aae 100644
--- a/.github/workflows/templates/test-package-downloads-action.yml.jinja
+++ b/.github/workflows/templates/test-package-downloads-action.yml.jinja
@@ -346,7 +346,7 @@ jobs:
         uses: actions/cache@v3.3.1
         with:
           path: nox.${{ matrix.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
               hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
             }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml
index 1a1b8a50268..6bed0c6a01c 100644
--- a/.github/workflows/test-package-downloads-action.yml
+++ b/.github/workflows/test-package-downloads-action.yml
@@ -445,7 +445,7 @@ jobs:
             arch: arm64
             pkg-type: package
           - distro-slug: macos-13-xlarge
-            arch: arm64
+            arch: aarch64
             pkg-type: onedir
 
     steps:
@@ -489,7 +489,7 @@ jobs:
         uses: actions/cache@v3.3.1
         with:
           path: nox.${{ matrix.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}|${{ matrix.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
               hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
             }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py
index a5e8efdba36..6b9f5193172 100644
--- a/tools/precommit/workflows.py
+++ b/tools/precommit/workflows.py
@@ -270,8 +270,6 @@ def generate_workflows(ctx: Context):
             arch = "arm64"
         test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package"))
     for slug, display_name, arch in build_ci_deps_listing["macos"][-1:]:
-        if arch == "aarch64":
-            arch = "arm64"
         test_salt_pkg_downloads_listing["macos"].append((slug, arch, "onedir"))
     for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]:
         for pkg_type in ("nsis", "msi", "onedir"):