diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 8e80f9c..4a30f8f 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,38 +4,44 @@
   If a section of the PR template does not apply to this PR, then delete that section.
  -->
 
-## Motivation
+## What type of PR is this?
 
-_(fill-in or delete this section)_
+_(REQUIRED)_
+
+- [ ] bug
+- [ ] cleanup  
+- [ ] documentation
+- [ ] feature
+
+## What this PR does / why we need it:
+
+_(REQUIRED)_
 
 <!--
   What goal is this change working towards?
+  Provide a bullet pointed summary of how each file was changed.
+  Briefly explain any decisions you made with respect to the changes.
+  Include anything here that you didn't include in *Release Notes*
+  above, such as changes to CI or changes to internal methods.
+-->
+
+## Which issue(s) this PR fixes:
+
+_(REQUIRED)_
+<!--
   If this PR fixes one of more issues, list them here.
   One line each, like so:
     Fixes #123
     Fixes #39
 -->
 
-## Release Notes
+## Special notes for your reviewer:
 
 _(fill-in or delete this section)_
 
 <!--
-  If this PR makes user facing changes, please describe them here.
-  This description will be copied into the release notes, whenever
-  the next version is released. Keep this section short, and
-  focus on high level changes.
--->
-
-## Changes
-
-_(fill-in or delete this section)_
-
-<!--
-  Provide a bullet pointed summary of how each file was changed.
-  Briefly explain any decisions you made with respect to the changes.
-  Include anything here that you didn't include in *Release Notes*
-  above, such as changes to CI or changes to internal methods.
+   Is there any particular feedback you would / wouldn't like?
+   Which parts of the code should reviewers focus on?
 -->
 
 ## Testing
@@ -46,11 +52,18 @@ _(fill-in or delete this section)_
   Describe how you tested this change.
 -->
 
-## Reviewer Guidelines
-
-_(fill-in or delete this section)_
+## Release Notes
 
+_(REQUIRED)_
 <!--
-   Is there any particular feedback you would / wouldn't like?
-   Which parts of the code should reviewers focus on?
+  If this PR makes user facing changes, please describe them here. This
+  description will be copied into the release notes/changelog, whenever the
+  next version is released. Keep this section short, and focus on high level
+  changes.
+
+  Put your text between the block. To omit notes, use NONE within the block.
 -->
+
+```release-note
+
+```
\ No newline at end of file
diff --git a/.github/stale.yml b/.github/stale.yml
index 563a9b5..a3282a2 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -14,7 +14,7 @@ onlyLabels: []
 exemptLabels:
   - pinned
   - security
-  - "type: maintenance" 
+  - "kind/maintenance" 
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: false
@@ -26,7 +26,7 @@ exemptMilestones: false
 exemptAssignees: false
 
 # Label to use when marking as stale
-staleLabel: "status: stale"
+staleLabel: "status/stale"
 
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >