diff --git a/.github/workflows/stale-issues-pr.yml b/.github/workflows/stale-issues-pr.yml
index cbf65e7e72..49e9590908 100644
--- a/.github/workflows/stale-issues-pr.yml
+++ b/.github/workflows/stale-issues-pr.yml
@@ -12,14 +12,14 @@ jobs:
     steps:
       - uses: actions/stale@v6
         with:
-          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
-          stale-pr-message: 'This PR is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.'
+          stale-pr-message: 'This PR is stale because it has been open 90 days with no activity.'
           close-issue-message: 'This issue was closed because it has been stalled for 7 days with no activity.'
           close-pr-message: 'This PR was closed because it has been stalled for 14 days with no activity.'
           days-before-issue-stale: 60
           days-before-pr-stale: 90
-          days-before-issue-close: 7
-          days-before-pr-close: 14
+          days-before-issue-close: -1
+          days-before-pr-close: -1
           stale-issue-label: 'no-issue-activity'
           exempt-issue-labels: 'awaiting-approval,work-in-progress'
           stale-pr-label: 'no-pr-activity'
diff --git a/.github/workflows/waiting-issues.yml b/.github/workflows/waiting-issues.yml
index 7e1814e20a..4caed43734 100644
--- a/.github/workflows/waiting-issues.yml
+++ b/.github/workflows/waiting-issues.yml
@@ -21,7 +21,7 @@ jobs:
           days-before-issue-close: 5
           days-before-pr-close: 10
           stale-issue-label: 'no-issue-activity'
-          exempt-issue-labels: 'awaiting-approval,work-in-progress'
+          exempt-issue-labels: 'awaiting-approval,work-in-progress,enhancement'
           stale-pr-label: 'no-pr-activity'
           exempt-pr-labels: 'awaiting-approval,work-in-progress'
           exempt-all-milestones: true