diff --git a/.github/actions/setup-python-tools-scripts/action.yml b/.github/actions/setup-python-tools-scripts/action.yml
index 845f3383800b..eec3c4e4e96b 100644
--- a/.github/actions/setup-python-tools-scripts/action.yml
+++ b/.github/actions/setup-python-tools-scripts/action.yml
@@ -7,10 +7,6 @@ inputs:
     required: true
     type: string
     description: Seed used to invalidate caches
-  cache-suffix:
-    required: false
-    type: string
-    description: Seed used to invalidate caches
   cwd:
     type: string
     description: The directory the salt checkout is located in
@@ -42,8 +38,8 @@ runs:
       shell: bash
       run: |
         VENV_NAME_HASH=$(echo "${{ inputs.cache-prefix }}|${{ github.workflow }}|${{
-          steps.get-python-version.outputs.version-sha256sum }}|${{ hashFiles('requirements/**/*.txt', 'tools/**/*.py') }}${{
-          inputs.cache-suffix || '' }}"  | sha256sum | cut -d ' ' -f 1)
+          steps.get-python-version.outputs.version-sha256sum }}|${{
+          hashFiles('requirements/**/*.txt', 'tools/**/*.py') }}"  | sha256sum | cut -d ' ' -f 1)
         echo "TOOLS_VIRTUALENV_CACHE_SEED=$VENV_NAME_HASH" | tee -a "${GITHUB_ENV}"
         echo "venv-hash=$VENV_NAME_HASH" | tee -a "${GITHUB_OUTPUT}"
 
diff --git a/.github/workflows/build-deps-onedir-linux.yml b/.github/workflows/build-deps-onedir-linux.yml
index a5718071f0ea..8d149c462611 100644
--- a/.github/workflows/build-deps-onedir-linux.yml
+++ b/.github/workflows/build-deps-onedir-linux.yml
@@ -62,8 +62,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}
-          cache-suffix: build-deps-linux-${{ matrix.arch }}
+          cache-prefix: ${{ inputs.cache-seed }}-build-deps-linux-${{ matrix.arch }}
 
       - name: Setup Relenv
         id: setup-relenv
diff --git a/.github/workflows/build-deps-onedir-macos.yml b/.github/workflows/build-deps-onedir-macos.yml
index 9f0dbc4ec757..02cf21c53653 100644
--- a/.github/workflows/build-deps-onedir-macos.yml
+++ b/.github/workflows/build-deps-onedir-macos.yml
@@ -64,8 +64,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}
-          cache-suffix: build-deps-macos
+          cache-prefix: ${{ inputs.cache-seed }}-build-deps-macos
 
       - name: Setup Relenv
         id: setup-relenv
diff --git a/.github/workflows/build-deps-onedir-windows.yml b/.github/workflows/build-deps-onedir-windows.yml
index fe0fb2d82531..af741e062242 100644
--- a/.github/workflows/build-deps-onedir-windows.yml
+++ b/.github/workflows/build-deps-onedir-windows.yml
@@ -65,8 +65,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ inputs.cache-seed }}
-          cache-suffix: 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/ci.yml b/.github/workflows/ci.yml
index 34c4d8611bd0..bb17af3705c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -279,8 +279,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: changelog
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-changelog
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -400,8 +399,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: build
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-build
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -2741,8 +2739,7 @@ jobs:
         id: python-tools-scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: coverage
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-coverage
 
       - name: Install Nox
         run: |
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 34e055d49748..96403e91c3c0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -323,8 +323,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: changelog
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-changelog
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -449,8 +448,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: build
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-build
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -2802,8 +2800,7 @@ jobs:
         id: python-tools-scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: coverage
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-coverage
 
       - name: Install Nox
         run: |
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index a267fcb43f73..c373dbe34fde 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -313,8 +313,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: changelog
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-changelog
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -434,8 +433,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: build
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-build
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -2775,8 +2773,7 @@ jobs:
         id: python-tools-scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: coverage
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-coverage
 
       - name: Install Nox
         run: |
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 88c297dd5d0b..a34f7f177d33 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -317,8 +317,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: changelog
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-changelog
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -439,8 +438,7 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: build
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-build
 
       - name: Setup Salt Version
         id: setup-salt-version
diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja
index b3d771891e11..b02604c40d8c 100644
--- a/.github/workflows/templates/ci.yml.jinja
+++ b/.github/workflows/templates/ci.yml.jinja
@@ -71,8 +71,7 @@
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: changelog
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-changelog
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -218,8 +217,7 @@
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: build
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-build
 
       - name: Setup Salt Version
         id: setup-salt-version
@@ -330,8 +328,7 @@
         id: python-tools-scripts
         uses: ./.github/actions/setup-python-tools-scripts
         with:
-          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-          cache-suffix: coverage
+          cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}-coverage
 
       - name: Install Nox
         run: |