diff --git a/.github/actions/install-mesa/action.yml b/.github/actions/install-mesa/action.yml
index 1b97be8165..8cbe60e49c 100644
--- a/.github/actions/install-mesa/action.yml
+++ b/.github/actions/install-mesa/action.yml
@@ -38,7 +38,7 @@ runs:
       id: lfs-cache
       with:
         path: .git/lfs
-        key: ${{ runner.os }}-${{ hashFiles('.lfs-assets-id') }}-v1
+        key: lfs-${{ hashFiles('.lfs-assets-id') }}-v1
 
     - name: Git LFS Pull
       run: git lfs pull
diff --git a/.github/actions/install-sdk-linux/action.yml b/.github/actions/install-sdk-linux/action.yml
index 7ed5d8fc1e..52bdf52437 100644
--- a/.github/actions/install-sdk-linux/action.yml
+++ b/.github/actions/install-sdk-linux/action.yml
@@ -23,7 +23,7 @@ runs:
       with:
         path: |
           mesasdk-x86_64-linux-${{inputs.sdk}}.tar.gz
-        key: linux-${{inputs.sdk}}
+        key: sdk-linux-${{inputs.sdk}}
 
     - name: Download SDK '${{ inputs.sdk }}'
       shell: bash
diff --git a/.github/actions/install-sdk-macos/action.yml b/.github/actions/install-sdk-macos/action.yml
index bb953b3fb2..0ab062d490 100644
--- a/.github/actions/install-sdk-macos/action.yml
+++ b/.github/actions/install-sdk-macos/action.yml
@@ -20,8 +20,8 @@ runs:
       id: cache
       with:
         path: |
-          mesasdk-aarch64-macos-${{inputs.sdk}}.tar.gz
-        key: macos-${{inputs.sdk}}
+          mesasdk-aarch64-macos-${{inputs.sdk}}.pkg
+        key: sdk-macos-${{inputs.sdk}}
 
     - name: Download SDK
       shell: bash