diff --git a/.github/workflows/clean-closed.yml b/.github/workflows/clean-closed.yml
index 3f370a4362..c597c2d8c6 100644
--- a/.github/workflows/clean-closed.yml
+++ b/.github/workflows/clean-closed.yml
@@ -23,7 +23,8 @@ jobs:
           - "S: Please Merge"
           - "S: Please Test"
           - "help wanted"
-          - "Bug: Potential ?"
+          - "bug"
+          - "work-in-progress"
           - "Needs: Discussion"
           - "Needs: Documentation"
           - "Needs: More Data"
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
index 8c53238cb6..8d983452ec 100644
--- a/.github/workflows/close-stale.yml
+++ b/.github/workflows/close-stale.yml
@@ -7,7 +7,7 @@ name: Close Stale Issues
 
 on:
   schedule:
-  - cron: "22 1 3 * *"
+  - cron: '22 1 * * 0'
 
 jobs:
   stale:
@@ -21,8 +21,14 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has had no activity in the last 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.'
+        stale-pr-message: 'This pull request has had no activity in the last 60 days. Please update your branch.'
+        close-issue-message: 'This issue was closed because it has had no activity in the last 10 days.'
         days-before-stale: 60
         days-before-close: 10
-        stale-issue-label: 'stale-closing-soon'
+        days-before-pr-close: -1
+        stale-issue-label: 'Stale'
+        stale-pr-label: 'Stale'
+        remove-stale-when-updated: true
         exempt-all-assignees: true
-        exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'
+        exempt-issue-labels: 'bug,Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking,work-in-progress'
+        close-issue-reason: 'will not fix,false alarm,duplicate'