diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b0ee5d8..6b01ca5 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -35,6 +35,7 @@ Before submitting a pull request:
 
 - Check the codebase to ensure that your feature doesn't already exist.
 - Check the pull requests to ensure that another person hasn't already submitted the feature or fix.
+- Link resolved issues in the PR body using [GitHub keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) (`Closes #123`, `Fixes #123`, or `Resolves #123`) so they auto-close on merge.
 
 ## Requirements
 
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..3ac0c0a
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,13 @@
+## Summary
+
+<!-- What changed and why? -->
+
+## Linked issues
+
+<!-- Use GitHub keywords so issues auto-close when this PR is merged. -->
+
+Closes #
+
+## Test plan
+
+- [ ]