diff --git a/.github/workflows/cleanup.yaml b/.github/workflows/cleanup.yaml
index 7c235004c..99ab6cb1b 100644
--- a/.github/workflows/cleanup.yaml
+++ b/.github/workflows/cleanup.yaml
@@ -3,6 +3,9 @@ on:
   pull_request_target:
     types:
       - closed
+  pull_request:
+    types:
+      - closed
   push:
     branches:
       - develop
@@ -40,7 +43,7 @@ jobs:
 
           for key in $cacheKeys; do
             echo "Cache \"$key will\" will be deleted"
-            gh cache delete $key || true
+            gh cache delete "$key" || true
           done
 
           echo "Cache cleanup completed"
diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
index 08ab20502..025691810 100644
--- a/.github/workflows/npm.yml
+++ b/.github/workflows/npm.yml
@@ -339,7 +339,7 @@ jobs:
           echo "🗑️ Deleting caches..."
           for key in $cacheKeys; do
             echo "Deleting cache: $key"
-            gh cache delete "$key" --confirm
+            gh cache delete "$key" || true
           done
 
           echo "✅ Cache cleanup completed"