diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index caba3649b..bc1fb8562 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -34,4 +34,4 @@ runs:
       with:
         path: |
           products.tar
-        key: ${{ runner.os }}-deriveddata-${{ github.ref }}-${{ github.sha }}
\ No newline at end of file
+        key: ${{ runner.os }}-deriveddata-${{ github.event.pull_request.head.sha }}
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7acd8274b..d16a2095c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,9 +50,7 @@ jobs:
       with:
         path: |
           products.tar
-        key: ${{ runner.os }}-deriveddata-${{ github.ref }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-deriveddata-${{ github.ref }}-
+        key: ${{ runner.os }}-deriveddata-${{ github.event.pull_request.head.sha }}
 
     - name: Untar DerivedDataCache
       shell: bash