diff --git a/.github/actions/toolchain-build/action.yml b/.github/actions/toolchain-build/action.yml
index f05b5be8..bbaf6513 100644
--- a/.github/actions/toolchain-build/action.yml
+++ b/.github/actions/toolchain-build/action.yml
@@ -20,7 +20,7 @@ runs:
       id: toolchain-build-riscv-tools
       with:
         path: ${{ inputs.tools-version }}-install
-        key: riscv-tools-installed-${{ env.tools-cache-version }}-${{ hashFiles(riscv-tools.hash) }}
+        key: riscv-tools-installed-${{ env.tools-cache-version }}-${{ hashFiles(**/riscv-tools.hash) }}
 
     # brute force way to swap between riscv/esp-tools caches
     - name: Cache esp-tools
@@ -28,7 +28,7 @@ runs:
       id: toolchain-build-esp-tools
       with:
         path: ${{ inputs.tools-version }}-install
-        key: esp-tools-installed-${{ env.tools-cache-version }}-${{ hashFiles(esp-tools.hash) }}
+        key: esp-tools-installed-${{ env.tools-cache-version }}-${{ hashFiles(**/esp-tools.hash) }}
 
     - name: Build toolchain if not cached
       run: |
diff --git a/.github/scripts/create-hash.sh b/.github/scripts/create-hash.sh
index dae9f25d..0fa95628 100755
--- a/.github/scripts/create-hash.sh
+++ b/.github/scripts/create-hash.sh
@@ -15,6 +15,6 @@ for tools in 'riscv-tools' 'esp-tools' ; do
     git submodule status "toolchains/${tools}" 'toolchains/libgloss' 'toolchains/qemu' |
     while read -r line ; do
         echo "${line#[!0-9a-f]}"
-    done > "${tools}.hash"
+    done > "$GITHUB_WORKSPACE/${tools}.hash"
 done
 echo "Hashfile for riscv-tools and esp-tools created in $HOME"