diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
index e5f0fabb5..003ce651c 100644
--- a/.github/workflows/cleanup.yml
+++ b/.github/workflows/cleanup.yml
@@ -10,17 +10,11 @@ env:
   WERF_ENV: "production"
   WERF_REPO: "ghcr.io/${{ github.repository_owner }}/werfio-guides"
   WERF_STAGES_STORAGE: "ghcr.io/werf/werfio-guides-stages"
-  WERF_KUBE_CONFIG_BASE64: ${{ secrets.KUBECONFIG_BASE64_PROD }}
 
 jobs:
   cleanup:
     name: Cleanup
     runs-on: ubuntu-latest-4-cores
-    strategy:
-      matrix:
-        repo:
-          - "ghcr.io/${{ github.repository_owner }}/werfio-guides"
-          - "ghcr.io/werf/werfio-guides-stages"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -39,4 +33,15 @@ jobs:
           WERF_LOG_VERBOSE: "on"
           WERF_REPO_GITHUB_TOKEN: ${{ secrets.REGISTRY_CLEANUP_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WERF_REPO: ${{ matrix.repo }}
\ No newline at end of file
+          WERF_KUBE_CONFIG_BASE64: ${{ secrets.KUBECONFIG_BASE64_PROD }}
+
+      - name: Cleanup staged storage
+        run: |
+          . $(werf ci-env github --as-file)
+          werf cleanup
+        env:
+          WERF_LOG_VERBOSE: "on"
+          WERF_REPO_GITHUB_TOKEN: ${{ secrets.REGISTRY_CLEANUP_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WERF_REPO: "ghcr.io/werf/werfio-guides-stages"
+          WERF_WITHOUT_KUBE: "true"