diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e4f754d66..9d5e9948f 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 OpenZFS
 title: ''
-labels: 'Type: Defect'
+labels: 'Type: Defect', 'Status: Triage Needed'
 assignees: ''
 
 ---
diff --git a/.github/stale.yml b/.github/stale.yml
index d59984b1b..895cc8e80 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -7,7 +7,14 @@ only: issues
 # Issues with these labels will never be considered stale
 exemptLabels:
   - "Type: Feature"
-  - "Type: Understood"
+  - "Bot: Not Stale"
+  - "Status: Work in Progress"
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: true
 # Label to use when marking an issue as stale
 staleLabel: "Status: Stale"
 # Comment to post when marking an issue as stale. Set to `false` to disable
@@ -15,3 +22,5 @@ markComment: >
   This issue has been automatically marked as "stale" because it has not had
   any activity for a while. It will be closed in 90 days if no further activity occurs. 
   Thank you for your contributions.
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 6