diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 52%
rename from .github/issue_template.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 72e663ea733..1a324740cbd 100644
--- a/.github/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,8 +1,10 @@
-<!--
-Do you have a question? Please ask it on https://stackoverflow.com/questions/tagged/vscode.
+---
+name: Bug report
+about: Create a report to help us improve
 
-For bug reports, please fill in the details below. For feature requests, please describe the desired feature.
--->
+---
+
+<!-- Please search existing issues to avoid creating duplicates. -->
 
 <!-- Use Help > Report Issue to prefill these. -->
 - VSCode Version:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000000..a820760fc48
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,9 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+<!-- Please search existing issues to avoid creating duplicates. -->
+
+<!-- Describe the feature you'd like. -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000000..2043e48c7aa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,9 @@
+---
+name: Question
+about: The issue tracker is not for questions. Please ask questions on https://stackoverflow.com/questions/tagged/vscode.
+
+---
+
+🚨 The issue tracker is not for questions 🚨
+
+If you have a question, please ask it on https://stackoverflow.com/questions/tagged/vscode.