diff --git a/.github/ISSUE_TEMPLATE/jep-pre-proposal.md b/.github/ISSUE_TEMPLATE/jep-pre-proposal.md
new file mode 100644
index 00000000..3659068c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/jep-pre-proposal.md
@@ -0,0 +1,10 @@
+---
+name: JEP pre-proposal
+about: Open a JEP pre-proposal
+title: ''
+labels: JEP pre-proposal
+assignees: ''
+
+---
+
+Describe your pre-proposal here
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 00000000..fb0ce236
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,11 @@
+---
+name: Other
+about: Open an issue that's not a JEP pre-proposal (discussion, suggestion for this
+  repository, etc)
+title: ''
+labels: Discussion
+assignees: ''
+
+---
+
+