diff --git a/.github/workflows/remove-stale-label.yml b/.github/workflows/remove-stale-label.yml
index 2e58cc8cb..7b9c1bafb 100644
--- a/.github/workflows/remove-stale-label.yml
+++ b/.github/workflows/remove-stale-label.yml
@@ -9,16 +9,6 @@ permissions:
   pull-requests: write
 
 jobs:
-  debug:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Debug
-        run: |
-          echo "Event name: ${{ github.event_name }}"
-          echo "Comment body: ${{ github.event.comment.body }}"
-          echo "Issue number: ${{ github.event.issue.number }}"
-          echo "Pull request number: ${{ github.event.pull_request.number }}"
-
   remove-stale-label:
     if: github.event.comment.body == '/stale-extend'
     runs-on: ubuntu-latest
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index c1abdf309..57993fe08 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -30,8 +30,11 @@ jobs:
           days-before-stale: 21
           days-before-close: 14
           enable-statistics: true
-          exempt-issue-labels: "awaiting-response"
+          exempt-issue-labels: "awaiting-response,Question,Resolved"
           exempt-pr-labels: "awaiting-response"
+          exempt-draft-pr: true
+          exempt-all-assignees: true
+          exempt-all-milestones: true
           remove-stale-when-updated: true
           stale-issue-message: "We have noticed this issue has not been updated within 21 days. If there is no action on this issue in the next 14 days, we will automatically close it. You can use `/stale-extend` to extend the window."
           stale-pr-message: "We have noticed this PR has not been updated within 21 days. If there is no action on this PR in the next 14 days, we will automatically close it. You can use `/stale-extend` to extend the window."
@@ -44,25 +47,33 @@ jobs:
         name: Question and Resolved issue stale bot
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 5
-          days-before-close: 2
+          days-before-stale: 10
+          days-before-close: 7
           enable-statistics: true
-          only-issue-labels: "Question,Resolved"
+          any-of-issue-labels: "Question,Resolved"
+          exempt-all-assignees: true
+          exempt-all-milestones: true
           remove-stale-when-updated: true
-          stale-issue-message: "We have noticed this issue has been resolved for 5 days. If there is no action on this issue in the next 2 days, we will automatically close it. You can use `/stale-extend` to extend the window."
+          stale-issue-message: "We have noticed this issue has been marked as Question or Resolved and has not been updated within 10 days. If there is no action on this issue in the next 7 days, we will automatically close it. You can use `/stale-extend` to extend the window."
+          close-issue-message: "This issue has remained stale after being marked as Question or Resolved and has been automatically closed."
           stale-issue-label: "stale"
 
       - uses: actions/stale@v10
         name: Awaiting response issue and PR stale bot
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: 7
-          days-before-close: 3
+          days-before-stale: 10
+          days-before-close: 7
           enable-statistics: true
           only-issue-labels: "awaiting-response"
           only-pr-labels: "awaiting-response"
+          exempt-draft-pr: true
+          exempt-all-assignees: true
+          exempt-all-milestones: true
           remove-stale-when-updated: true
-          stale-issue-message: "We have noticed this issue has been awaiting response for 7 days. If there is no action on this issue in the next 3 days, we will automatically close it. You can use `/stale-extend` to extend the window."
-          stale-pr-message: "We have noticed this PR has been awaiting response for 7 days. If there is no action on this PR in the next 3 days, we will automatically close it. You can use `/stale-extend` to extend the window."
+          stale-issue-message: "We have noticed this issue has been awaiting response for 10 days. If there is no action on this issue in the next 7 days, we will automatically close it. You can use `/stale-extend` to extend the window."
+          stale-pr-message: "We have noticed this PR has been awaiting response for 10 days. If there is no action on this PR in the next 7 days, we will automatically close it. You can use `/stale-extend` to extend the window."
+          close-issue-message: "This issue has remained in awaiting response state and has been automatically closed."
+          close-pr-message: "This PR has remained in awaiting response state and has been automatically closed."
           stale-issue-label: "stale"
           stale-pr-label: "stale"