diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000000..1b0fed9acdd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,22 @@
+---
+name: 'Bug Report'
+about: 'Report a bug in go-ipfs.'
+labels:
+  - bug
+---
+
+#### Version information:
+<!-- Output From `ipfs version --all`
+
+Please check dist.ipfs.io for a newer version of go-ipfs and update if necessary. Report back if the problem persists.
+
+If you can't run `ipfs version --all` or that command fails, include as much information as you can: IPFS version, computer architecture (e.g., Intel x86 64bit), operating system, etc. -->
+
+#### Description:
+<!-- This is where you get to tell us what went wrong. When doing so, please make sure to include *all* relevant information.
+
+Please try to include:
+  * What you were doing when you experienced the bug.
+  * Any error messages you saw, *where* you saw them, and what you believe may have caused them (if you have any ideas).
+  * When possible, steps to reliably produce the bug.
+-->
diff --git a/.github/ISSUE_TEMPLATE/doc.md b/.github/ISSUE_TEMPLATE/doc.md
new file mode 100644
index 00000000000..4662fb7bb06
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/doc.md
@@ -0,0 +1,14 @@
+---
+name: 'Documentation Issue'
+about: 'Report missing/erroneous documentation, propose new documentation, report broken links, etc.'
+labels:
+  - documentation
+---
+
+#### Location
+
+<!-- In the case of missing/erroneous documentation, where is the error? If possible, a link/url would be great! -->
+
+#### Description
+
+<!-- Describe the documentation issue. -->
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 00000000000..6615bf70e8c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,12 @@
+---
+name: 'Enhancement'
+about: 'Suggest an improvement to an existing go-ipfs feature.'
+labels:
+  - enhancement
+---
+
+<!--
+Note: If you'd like to suggest an idea related to IPFS but not specifically related to the go implementation, please file an issue at https://github.com/ipfs/ipfs instead
+
+When requesting an _enhancement_, please be sure to include your motivation and try to be as specific as possible.
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 00000000000..c8b1c8f50db
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,16 @@
+---
+name: 'Feature
+about: 'Suggest a new feature in go-ipfs.'
+labels:
+  - feature
+---
+
+<!--
+Note: If you'd like to suggest an idea related to IPFS but not specifically related to the go implementation, please file an issue at https://github.com/ipfs/ipfs instead
+
+When requesting a _feature_, please be sure to include:
+  * Your motivation. Why do you need the feature?
+  * How the feature should work.
+
+Please try to be as specific and concrete as possible.
+-->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000000..4876ae59dde
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,11 @@
+---
+name: 'Question/Support'
+about: 'Ask a question about go-ipfs or request support.'
+labels:
+  - question
+  - invalid
+---
+
+This bug tracker is only for actionable bug reports and feature requests. Please direct any questions to https://discuss.ipfs.io or to our Matrix (#ipfs:matrix.org) or IRC (#ipfs on freenode) channels.
+
+If you don't get an immediate response, please keep trying.
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 1646b2af10b..00000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,39 +0,0 @@
-<!-- 🔥❓If you have a *QUESTION* about IPFS, please ask on our forum at https://discuss.ipfs.io 🔥❓
-
-The go-ipfs issues are *only* for bug reports and directly actionable feature requests. Please direct all other questions, ideas, or suggestions to our discuss forum. Remember to search the issue tracker for an existing report concerning your issue before posting. If you want to discuss a design idea related to ipfs but not directly related to the go implementation, please file an issue at https://github.com/ipfs/ipfs.
--->
-
-#### Version information:
-<!-- Output From `ipfs version --all`
-
-Please check dist.ipfs.io for a newer version of go-ipfs and update if necessary. Report back if the problem persists.
-
-If you can't run `ipfs version --all` or that command fails, include as much information as you can: IPFS version, computer architecture (e.g., Intel x86 64bit), operating system, etc. -->
-
-#### Type:
-<!--
-
-- "bug": If what you are filing is a bug.
-- "panic": If you'd like to report an application panic, segfault, crash, etc.
-- "feature": If you'd like to suggest a feature.
-- "enhancement ": If you'd like to suggest an improvement on to existing feature.
-- "test failure": If the tests are failing
-- "doc": If it's related to missing/incorrect documentation.
-- "meta": If its a meta issue about this project/this repository/issue tracker.
-
-Feel free to choose your own category if none of these fit your needs. However, be careful, that may indicate that your issue doesn't belong in this repo.
-
--->
-
-#### Description:
-<!-- This is where you get to tell us what went wrong or your specific feature request. When doing so, please make sure to include *all* relevant information.
-
-When reporting a _bug_, please try to include:
-  * What you were doing when you experienced the bug.
-  * Any error messages you saw, *where* you saw them, and what you believe may have caused them (if you have any ideas).
-  * When possible, steps to reliably produce the bug.
-
-When requesting a _feature_, please be sure to include:
-  * Your motivation. Why do you need the feature?
-  * How the feature should work.
--->