diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
deleted file mode 100644
index ed296fa16..000000000
--- a/.github/ISSUE_TEMPLATE
+++ /dev/null
@@ -1,36 +0,0 @@
-Please check off the following before submitting your issue:
-
-+ [ ] I ran `make clean && make` and restarted Emacs, but the issue persists.
-+ [ ] I ran `make doctor` and it produced nothing conclusive.
-+ [ ] [The troubleshooting section of the FAQ](/wiki/FAQ#troubleshooting) says
-      nothing about my issue.
-+ [ ] I read the README.org files of any modules that are relevant (that I am
-      aware of).
-+ [ ] I filled out the four fields in the template below.
-+ [ ] I have deleted this checklist and message.
-
----
-
-### Observed behavior
-
-Describe what happened.
-
-### Expected behavior
-
-Describe what you expected to happen.
-
-### Steps to reproduce
-
-1. Select these example steps,
-2. Delete them,
-3. And replace them with precise steps to reproduce your issue.
-
-### System information
-
-<details>
-<summary>Click to expand</summary>
-
-```
-Replace this line with the output of `M-x doom/info` OR `DEBUG=1 make doctor`
-```
-</details>
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..a09ea6ab4
--- /dev/null
+++ b/docs/ISSUE_TEMPLATE.md
@@ -0,0 +1,30 @@
++ [ ] I've checked for duplicates of this issue.
++ [ ] `bin/doom clean` and `bin/doom refresh` (then restarting Emacs) did not
+      fix my issue.
++ [ ] I ran `make doctor` and it produced no leads.
++ [ ] My issue cannot be found [in the FAQ](/../../wiki/FAQ)
++ [ ] I filled out the four fields in the template below.
++ [ ] I have deleted this checklist and message.
+
+### Observed behavior
+
+(Describe what happened)
+
+### Expected behavior
+
+(Describe what you expected to happen)
+
+### Steps to reproduce
+
+1. Select these example steps,
+2. Delete them,
+3. And replace them with precise steps to reproduce your issue.
+4. Fill in "system information" below.
+
+### System information
+
+<details>
+<summary>Click to expand</summary>
+
+Replace this line with the output of `M-x doom/info` OR `~/.emacs.d/bin/doom info`
+</details>
diff --git a/.github/PULL_REQUEST_TEMPLATE b/docs/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE
rename to docs/PULL_REQUEST_TEMPLATE.md