diff --git a/.github/workflows/cleanup_caches.yml b/.github/workflows/cleanup_caches.yml
index 3cde65ca1d..b839cea15f 100644
--- a/.github/workflows/cleanup_caches.yml
+++ b/.github/workflows/cleanup_caches.yml
@@ -10,8 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: |
-          caches=$(gh cache list -R ${{ github.repository }} -L 100 --json id,key,ref -S last_accessed_at -O desc)
-          echo "$caches" | jq -c '
+          gh cache list -L 100 --json id,key,ref -S last_accessed_at -O desc --jq '
             map(select(.key | startswith("x86_64-w64-mingw32-") or
                               startswith("i686-w64-mingw32-") or
                               startswith("x86_64-windows-msvc-"))) |
@@ -27,14 +26,15 @@ jobs:
           ' |
           while read -r group; do
             pr=$(echo "$group" | jq -r '.ref | capture("refs/pull/(?<num>[0-9]+)/merge").num')
-            if [[ -n "$pr" ]] && [ "$(gh pr view -R ${{ github.repository }} $pr --json state --jq '.state')" != "OPEN" ]; then
+            if [[ -n "$pr" ]] && [ "$(gh pr view $pr --json state --jq '.state')" != "OPEN" ]; then
               keys=$(echo "$group" | jq -c '.caches | map(.keys) | .[]')
             else
               keys=$(echo "$group" | jq -c '.caches | map(.keys[1:]) | .[]')
             fi
             for key in $(echo "$keys" | jq -r '.[]'); do
-              gh cache delete "$key" -R ${{ github.repository }}
+              gh cache delete "$key"
             done
           done
     env:
+      GH_REPO: ${{ github.repository }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}