diff --git a/.azuredevops/pull_request_template/branches/release.md b/.azuredevops/pull_request_template/branches/release.md
new file mode 100644
index 000000000000..59ad82ee7ad9
--- /dev/null
+++ b/.azuredevops/pull_request_template/branches/release.md
@@ -0,0 +1,45 @@
+# {PR title}
+
+Summary of the changes (Less than 80 chars)
+
+## Description
+
+{Detail}
+
+Fixes #{bug number} (in this specific format)
+
+## Customer Impact
+
+{Justification}
+
+## Regression?
+
+- [ ] Yes
+- [ ] No
+
+[If yes, specify the version the behavior has regressed from]
+
+## Risk
+
+- [ ] High
+- [ ] Medium
+- [ ] Low
+
+[Justify the selection above]
+
+## Verification
+
+- [ ] Manual (required)
+- [ ] Automated
+
+## Packaging changes reviewed?
+
+- [ ] Yes
+- [ ] No
+- [ ] N/A
+
+----
+
+## When servicing release/2.1
+
+- [ ] Make necessary changes in eng/PatchConfig.props
diff --git a/.azuredevops/pull_request_template/minimal.md b/.azuredevops/pull_request_template/minimal.md
new file mode 100644
index 000000000000..cee383576e93
--- /dev/null
+++ b/.azuredevops/pull_request_template/minimal.md
@@ -0,0 +1,13 @@
+# {PR title}
+
+<!--
+  Use for tell mode PRs after removing servicing template. Ignoring internal PRs targeting main (extreme corner case).
+-->
+
+Summary of the changes (Less than 80 chars)
+
+## Description
+
+{Detail}
+
+Fixes #{bug number} (in this specific format)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5a872ab23f62..6ab8f9860a3b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,6 +4,7 @@
 *                                                                                 @Pilchie
 /global.json                                                                      @dotnet/aspnet-build
 /.azure/                                                                          @dotnet/aspnet-build
+/.azuredevops/                                                                    @dotnet/aspnet-build
 /.config/                                                                         @dotnet/aspnet-build
 /.devcontainer/                                                                   @captainsafia
 /.github/                                                                         @dotnet/aspnet-build
diff --git a/.github/PULL_REQUEST_TEMPLATE/servicing.md b/.github/PULL_REQUEST_TEMPLATE/servicing.md
index f5f75de09bf8..59ad82ee7ad9 100644
--- a/.github/PULL_REQUEST_TEMPLATE/servicing.md
+++ b/.github/PULL_REQUEST_TEMPLATE/servicing.md
@@ -1,18 +1,26 @@
+# {PR title}
+
+Summary of the changes (Less than 80 chars)
+
 ## Description
 
+{Detail}
 
+Fixes #{bug number} (in this specific format)
 
 ## Customer Impact
 
-
+{Justification}
 
 ## Regression?
+
 - [ ] Yes
 - [ ] No
 
 [If yes, specify the version the behavior has regressed from]
 
 ## Risk
+
 - [ ] High
 - [ ] Medium
 - [ ] Low
@@ -20,13 +28,18 @@
 [Justify the selection above]
 
 ## Verification
+
 - [ ] Manual (required)
 - [ ] Automated
 
 ## Packaging changes reviewed?
+
 - [ ] Yes
 - [ ] No
 - [ ] N/A
 
+----
+
+## When servicing release/2.1
 
-Addresses [issue number]
\ No newline at end of file
+- [ ] Make necessary changes in eng/PatchConfig.props
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index e2ad94ca9b04..f35e445f6ea9 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,4 @@
+# {PR title}
 
 <!-- Thank you for submitting a pull request to our repo. -->
 
@@ -11,11 +12,10 @@ below to ensure a smooth review and merge process for your PR. -->
 
 <!-- Once all that is done, you're ready to go. Open the PR with the content below. -->
 
-**PR Title**
 Summary of the changes (Less than 80 chars)
 
-**PR Description**
-Detail 1
-Detail 2
+## Description
 
-Fixes #bugnumber (in this specific format)
+{Detail}
+
+Fixes #{bug number} (in this specific format)