diff --git a/.github/workflows/cache_clean.yml b/.github/workflows/cache_clean.yml
index ea23944b5..d2920843a 100644
--- a/.github/workflows/cache_clean.yml
+++ b/.github/workflows/cache_clean.yml
@@ -3,18 +3,20 @@
 name: Cache clean
 
 on:
-  # TODO restore schedule
-  #schedule:
-  #  # Run Mon-Sun at 11pm
-  #  - cron: '00 23 * * 1-7'
+  schedule:
+    # Run Mon-Sun at 11pm
+    - cron: '00 23 * * 1-7'
   workflow_dispatch:
-   inputs:
+    inputs:
       dryrun:
         required: true
         type: boolean
         default: true
-  # TODO delete pull_request
   pull_request:
+    branches:
+      - main
+    paths:
+      '.github/workflows/cache_clean.yml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -35,7 +37,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # Define unique cache prefixes for deletion
-          CACHE_PREFIX_LIST: "codeql-trap- sccache-sccache-"
+          CACHE_PREFIX_LIST: "sccache-sccache-"
         run: |
           # Install gh cache manager extension
           gh extension install actions/gh-actions-cache
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 969248aa1..002fd893d 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -50,6 +50,7 @@ jobs:
         with:
           languages: c-cpp
           build-mode: manual
+          trap-caching: false
 
       - name: build host x86_64 release
         uses: ./.github/actions/do_build_ock
@@ -97,6 +98,7 @@ jobs:
         with:
           languages: c-cpp
           build-mode: manual
+          trap-caching: false
 
       - name: build riscv m1
         uses: ./.github/actions/do_build_ock/do_build_m1