diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml
index 8a13c7e3777..df4d699a87c 100644
--- a/.github/workflows/build-deps-onedir.yml
+++ b/.github/workflows/build-deps-onedir.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}-build-deps-linux-${{ matrix.arch }}
+          cache-prefix: ${{ inputs.cache-seed }}|build-deps|linux|${{ matrix.arch }}
 
       - name: Setup Relenv
         id: setup-relenv
@@ -116,7 +116,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}-build-deps-macos
+          cache-prefix: ${{ inputs.cache-seed }}|build-deps|macos
 
       - name: Setup Relenv
         id: setup-relenv
@@ -166,7 +166,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}-build-deps-windows-${{ matrix.arch }}
+          cache-prefix: ${{ inputs.cache-seed }}|build-deps|windows|${{ matrix.arch }}
 
       - name: Setup Relenv
         id: setup-relenv
diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml
index 7913860cf7d..ff4b7a3857f 100644
--- a/.github/workflows/build-salt-onedir.yml
+++ b/.github/workflows/build-salt-onedir.yml
@@ -65,7 +65,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}-build-salt-onedir-windows
+          cache-prefix: ${{ inputs.cache-seed }}|build-salt-onedir|linux
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -130,7 +130,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}-build-salt-onedir-macos
+          cache-prefix: ${{ inputs.cache-seed }}|build-salt-onedir|macos
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -185,7 +185,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}-build-salt-onedir-macos
+          cache-prefix: ${{ inputs.cache-seed }}|build-salt-onedir|windows
 
       - name: Setup Salt Version
         id: setup-salt-version