diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/1_Bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md
similarity index 95%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to .github/ISSUE_TEMPLATE/2_Feature_request.md
index 597d62d47f..c55e5a62db 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/2_Feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: Feature request
+name: 🚀 Feature Request
 about: Suggest an idea for this project
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md
new file mode 100644
index 0000000000..9b69773f9b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3_Support_question.md
@@ -0,0 +1,10 @@
+---
+name: ⛔ Support Question
+about: See [PX4 Discuss](http://discuss.px4.io/) for questions about using PX4.
+
+---
+
+We use GitHub issues only to discuss PX4 bugs and new features. For
+questions about using PX4 or related components, please use [PX4 Discuss](http://discuss.px4.io/).
+
+Thanks!
diff --git a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
new file mode 100644
index 0000000000..42c0e77772
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md
@@ -0,0 +1,9 @@
+---
+name: ⛔ Documentation Issue
+about: See https://github.com/PX4/Devguide for documentation issues
+
+---
+
+PX4 has dedicated repositories for developer documentation (https://github.com/PX4/Devguide) and user documentation (https://github.com/PX4/px4_user_guide).
+
+Thanks!