diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd2bda78..d4c343e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
       uses: bazel-contrib/setup-bazel@c5acdfb288317d0b5c0bbd7a396a3dc868bb0f86 # 0.19.0
       with:
         bazelisk-cache: true
-        disk-cache: ${{ github.workflow }}
+        disk-cache: ${{ github.workflow }}-${{ matrix.os }}
         repository-cache: true
 
     - name: Install clang-format (Linux)
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 6c584b5b..1528cdbf 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -68,7 +68,7 @@ jobs:
       uses: bazel-contrib/setup-bazel@c5acdfb288317d0b5c0bbd7a396a3dc868bb0f86 # 0.19.0
       with:
         bazelisk-cache: true
-        disk-cache: ${{ github.workflow }}
+        disk-cache: ${{ github.workflow }}-${{ matrix.os }}-py${{ matrix.python-version }}
         repository-cache: true
 
     - name: Set Python Version
diff --git a/.github/workflows/stable-release-workflow.yml b/.github/workflows/stable-release-workflow.yml
index 7f54aa1f..274039e1 100644
--- a/.github/workflows/stable-release-workflow.yml
+++ b/.github/workflows/stable-release-workflow.yml
@@ -68,7 +68,7 @@ jobs:
       uses: bazel-contrib/setup-bazel@c5acdfb288317d0b5c0bbd7a396a3dc868bb0f86 # 0.19.0
       with:
         bazelisk-cache: true
-        disk-cache: ${{ github.workflow }}
+        disk-cache: ${{ github.workflow }}-${{ matrix.os }}-py${{ matrix.python-version }}
         repository-cache: true
 
     - name: Set Python Version