diff --git a/.github/workflows/docker-build-and-test.yml b/.github/workflows/docker-build-and-test.yml
index 63ca69c5..18b8a3c9 100644
--- a/.github/workflows/docker-build-and-test.yml
+++ b/.github/workflows/docker-build-and-test.yml
@@ -159,7 +159,9 @@ jobs:
         id: cache-toolchains
         uses: actions/cache/restore@v4
         with:
-          path: coreboot/util/crossgcc/${{ matrix.arch }}-xgcc
+          path: |
+            "${{ steps.coreboot-hash.outputs.COREBOOT_HASH }}-${{ matrix.arch }}-xgcc.tar"
+            "${{ steps.coreboot-hash.outputs.COREBOOT_HASH }}-${{ matrix.arch }}-xgcc.tar.sha256"
           key: ${{ steps.cache-key.outputs.CACHE_KEY }}-xgcc
 
       - name: Install dependencies if needed
@@ -222,7 +224,9 @@ jobs:
         uses: actions/cache/save@v4
         if: steps.toolchains-exist.outputs.EXIST == 'false' && steps.cache-toolchains.outputs.cache-hit != 'true'
         with:
-          path: coreboot/util/crossgcc/${{ matrix.arch }}-xgcc
+          path: |
+            "${{ steps.coreboot-hash.outputs.COREBOOT_HASH }}-${{ matrix.arch }}-xgcc.tar"
+            "${{ steps.coreboot-hash.outputs.COREBOOT_HASH }}-${{ matrix.arch }}-xgcc.tar.sha256"
           key: ${{ steps.cache-key.outputs.CACHE_KEY }}-xgcc