4 files changed, 11 insertions, 5 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2e64ef16d..57b415f7b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve QMK Firmware.
 title: "[Bug] "
-labels: bug, help wanted, discussion
+labels: bug, help wanted
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index f7eaa825b..187683424 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest a new feature or changes to existing features.
 title: "[Feature Request] "
-labels: enhancement, help wanted, discussion
+labels: enhancement, help wanted
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/other_issues.md b/.github/ISSUE_TEMPLATE/other_issues.md
index a0060a8ca..befeeb165 100644
--- a/.github/ISSUE_TEMPLATE/other_issues.md
+++ b/.github/ISSUE_TEMPLATE/other_issues.md
@@ -2,7 +2,7 @@
 name: Other issues
 about: Anything else that doesn't fall into the above categories.
 title: ''
-labels: help wanted, question, discussion
+labels: help wanted, question
 assignees: ''
 
 ---
diff --git a/.github/stale.yml b/.github/stale.yml
index b2c40591b..70804ff88 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -17,6 +17,9 @@ pulls:
     This pull request has been automatically marked as stale because it has not had
     activity in the last 45 days. It will be closed in 30 days if no further activity occurs.
     Please feel free to give a status update now, or re-open when it's ready.
+    
+    For maintainers: Please label with `awaiting review`, `breaking_change`, `in progress, or `on hold` to prevent 
+    the issue from being re-flagged.
   # Comment to post when closing a stale Issue or Pull Request.
   closeComment: >
     Thank you for your contribution!
@@ -33,14 +36,17 @@ pulls:
 
 # Issue specific configuration
 issues:
-  staleLabel: solved
+  staleLabel: stale
   limitPerRun: 10
   daysUntilStale: 90
   daysUntilClose: 30
   markComment: >
-    This issue has been automatically marked as resolved because it has not had activity in the
+    This issue has been automatically marked as stale because it has not had activity in the
     last 90 days. It will be closed in the next 30 days unless it is tagged properly or other activity
     occurs.
+    
+    For maintainers: Please label with `bug`, `in progress`, `on hold`, discussion` or `to do` to prevent 
+    the issue from being re-flagged.
   closeComment: >
     This issue has been automatically closed because it has not had activity in the last 30 days.
     If this issue is still valid, re-open the issue and let us know.