diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index c93d78b339a6..d6da3c4582c6 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -119,9 +119,8 @@ jobs:
             cat $GITHUB_OUTPUT
       - name: Restore from cache
         env:
-            NO_CACHE: ${{ steps.cache.outputs.no-cache || steps.issue_comment.outputs.DISABLE_CACHE || (steps.cache.outputs.deleted_count && steps.cache.outputs.deleted_count > 20) }}
+            NO_CACHE: ${{ (steps.cache.outputs.no-cache || steps.issue_comment.outputs.DISABLE_CACHE) || (steps.cache.outputs.deleted_count > 20) }}
             DISABLE_CACHE: ${{ steps.issue_comment.outputs.DISABLE_CACHE }}
-            DISABLE_CACHE2: ${{ steps.issue_comment.outputs.DISABLE_CACHE == 'true' }}
             BOOTSTRAP: ${{ steps.cache.outputs.bootstrap }}
             CONFIGURE: ${{ steps.cache.outputs.configure }}
             EVENT: ${{ github.event_name }}
@@ -129,8 +128,8 @@ jobs:
         run: |
             echo "${{ steps.issue_comment.outputs.DISABLE_CACHE }}"
             echo "${{ toJson(steps.cache.outputs) }}"
-            echo "${{ steps.cache.outputs.no-cache }}"
-            echo "${{ steps.cache.outputs.deleted_count }}"
+            echo "${{ steps.cache.outputs.no-cache || steps.issue_comment.outputs.DISABLE_CACHE }}"
+            echo "${{ steps.cache.outputs.deleted_count > 20 }}"
             .github/scripts/restore-from-prebuilt.sh "`pwd`" \
               "`pwd`/.github/otp.tar.gz" \
               "`pwd`/otp_archive.tar.gz"