diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 29b9255edc..db2983ecb8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,11 +14,23 @@
 
 <!-- How can the changes be verified? Please provide whatever additional information necessary to help verify the proposed changes. -->
 
+#### Testing ####
+
+<!-- Is this change covered by testing? If not, consider adding a Unit or Integration test. -->
+
 #### Linked Issues ####
 
 <!-- Link any related issues, pull-requests, or commit hashes that are relevant to this pull request. If you are opening a PR without a corresponding issue please consider creating one first, at https://github.com/rancher/rke2/issues . A functional example will greatly help QA with verifying/reproducing a bug or testing new features. -->
 
+#### User-Facing Change ####
+<!--
+Does this PR introduce a user-facing change? If no, just write "NONE" in the release-note block below.
+If the PR requires additional action from users switching to the new release, include the string "action required".
+-->
+```release-note
+
+```
+
 #### Further Comments ####
 
 <!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
-
diff --git a/MAINTAINERS b/MAINTAINERS
index 2452536ab2..b13bf54c85 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3,10 +3,17 @@
 
 brandond, Brad Davidson, brad.davidson@suse.com
 briandowns, Brian Downs, brian.downs@suse.com
-cjellick, Craig Jellick, craig.jellick@suse.com
+brooksn, Brooks Newberry, brooks.newberry@suse.com
+caroline-suse-rancher, Caroline Davis, caroline.davis@suse.com
+cwayne18, Chris Wayne, chris.wayne@suse.com
 dereknola, Derek Nola, derek.nola@suse.com
 galal-hussein, Hussein Galal, hussein.galalabdelazizahmed@suse.com
-ibuildthecloud, Darren Shepherd, darren.shepherd@suse.com
 manuelbuil, Manuel Buil, mbuil@suse.com
+matttrach, Matt Trachier, matt.trachier@suse.com
+mdrahman-suse, MD Rahman, md.rahman@suse.com
 Oats87, Chris Kim, chris.kim@suse.com
-vadorovsky, Michal Rostecki, mrostecki@suse.com
+rancher-max, Max Ross, max.ross@suse.com
+rbrtbnfgl, Roberto Bonafiglia, roberto.bonafiglia@suse.com
+ShylajaDevadiga, Shylaja Devadiga, shylaja.devadiga@suse.com
+thomasferrandiz, Thomas Ferrandiz, thomas.ferrandiz@suse.com
+VestigeJ, Justin Janes, justin.janes@suse.com