diff --git a/.github/workflows/add-cassettes.yml b/.github/workflows/add-cassettes.yml
index 90e4402d96af..9bf5b1b890ce 100644
--- a/.github/workflows/add-cassettes.yml
+++ b/.github/workflows/add-cassettes.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Reset branch
         run: |
           git checkout ${{ github.event.pull_request.base.ref }}
-          git reset --hard origin/cassette-diff-${{ github.event.pull_request.number }}
+          git reset --hard origin/cassette-diff-${{ github.event.pull_request.head.sha }}
 
       - name: Create PR
         id: create_pr
@@ -30,7 +30,7 @@ jobs:
         with:
           commit-message: Update cassettes
           signoff: false
-          branch: cassette-diff-${{ github.event.pull_request.number }}
+          branch: cassette-diff-${{ github.event.pull_request.head.sha }}
           delete-branch: false
           title: "Update cassettes"
           body: "This PR updates the cassettes."
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2afde5514a1..b36b45e8b69a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,11 +95,13 @@ jobs:
 
       - name: Stage new files and commit
         run: |
+          COMMIT_SHA=$(git rev-parse HEAD) # take the sha before committing the cassette
           git add tests
           git diff --cached --quiet && echo "No changes to commit" && exit 0
           git config user.email "github-actions@github.com"
           git config user.name "GitHub Actions"
           git commit -m "Add new cassettes"
-          git checkout -b cassette-diff-${{ github.event.pull_request.number }}
+          
+          git checkout -b cassette-diff-${COMMIT_SHA}
           git remote add target https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.event.pull_request.base.repo.full_name }}
-          git push -f target cassette-diff-${{ github.event.pull_request.number }}
+          git push -f target cassette-diff-${COMMIT_SHA}