diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 128f51ffd..2df863ae8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
-name: bug report
-about: create a bug report
+name: Bug Report
+about: Create a bug report.
 ---
 
 Your issue may already be reported!
diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_or_feature.md b/.github/PULL_REQUEST_TEMPLATE/bug_or_feature.md
new file mode 100644
index 000000000..a1fa98ea8
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/bug_or_feature.md
@@ -0,0 +1,33 @@
+---
+name: Bug / Feature
+about: Submit a bug fix or feature.
+---
+
+## PR Type
+What kind of change does this PR make?
+
+<!-- Check the one that applies to this PR using "[x]". -->
+
+- [ ] Bug fix
+- [ ] Feature
+- [ ] Refactor / code style change (no functional or public API changes)
+- [ ] Other
+
+
+## PR Checklist
+Check your PR fulfills the following:
+
+<!-- For draft PRs check the boxes as you complete them. -->
+
+- [ ] Tests for the changes have been added / updated.
+- [ ] Documentation comments have been added / updated.
+- [ ] A changelog entry has been made for the appropriate packages.
+
+
+## Overview
+<!-- Describe the current and new behavior. -->
+<!-- Emphasize any breaking changes. -->
+
+
+<!-- If this PR fixes or closes an issue, reference it here. -->
+<!-- Closes #000 -->