diff --git a/.github/PULL_REQUEST_TEMPLATE/CHERRY_PICK.md b/.github/PULL_REQUEST_TEMPLATE/CHERRY_PICK.md
new file mode 100644
index 0000000000..f12893ed69
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/CHERRY_PICK.md
@@ -0,0 +1,6 @@
+- **Explanation**: _A description of the issue being fixed or enhancement being made. This can be brief, but it should be clear._
+- **Scope**: _An assessment of the impact/importance of the change. For example, is the change a source-breaking language change, etc._
+- **GitHub Issue**: _The issue number if the change fixes/implements an issue/enhancement on [GitHub Issues](https://github.com/apple/swift-docc/issues)._
+- **Risk**: _What is the (specific) risk to the release for taking this change?_
+- **Testing**: _What specific testing has been done or needs to be done to further validate any impact of this change?_
+- **Reviewer**: _One or more code owners for the impacted components should review the change. Technical review can be delegated by a code owner or otherwise requested as deemed appropriate or useful._
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/DEFAULT.md
similarity index 100%
rename from .github/pull_request_template.md
rename to .github/PULL_REQUEST_TEMPLATE/DEFAULT.md
diff --git a/.gitignore b/.gitignore
index 3af5306b75..973c8917bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ DerivedData
 docc-dist-build
 .docc-build
 .swiftpm
+.vscode