diff --git a/.github/actions/base_images/action.yml b/.github/actions/base_images/action.yml
index 42bc97ad..fdc54c90 100644
--- a/.github/actions/base_images/action.yml
+++ b/.github/actions/base_images/action.yml
@@ -103,7 +103,7 @@ runs:
       shell: bash
 
     - name: Clear cache for next upload
-      if: env.BUILD_IMAGES && steps.cache.outputs.cache-hit == 'true'
+      if: env.BUILD_IMAGES && steps.cache.outputs.cache-hit == 'true' && github.event_name != 'pull_request'
       run: |
         echo "Deleting existing cache for ${{ steps.hash_key.outputs.base_cache_key }}"
         gh cache delete "base-images=${{ steps.hash_key.outputs.base_cache_key }}" -R ${{ github.repository }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd7a2e4c..2fcab260 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,8 +57,6 @@ jobs:
       - name: Build base images
         id: build_base_images
         uses: "./.github/actions/base_images"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           python_version: "3.9"