diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..5288a1f2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,21 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+<!--
+
+1. Please provide steps that reproduce the problem at the Monaco Editor homepage
+ -- https://microsoft.github.io/monaco-editor/
+
+2. Otherwise, please provide a Playground code snippet
+ -- https://microsoft.github.io/monaco-editor/playground.html
+
+ -->
+**monaco-editor version:** 0.X.Y
+**Browser:**
+**OS:**
+**Playground code that reproduces the issue:**
+
+```js
+```
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..e14ffcda
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question
+    url:  https://stackoverflow.com/questions/tagged/monaco-editor
+    about: Please ask and answer questions here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..a820760f
--- /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.md b/.github/issue_template.md
deleted file mode 100644
index 81f0543b..00000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Do you have a question? Please ask it on https://stackoverflow.com/questions/tagged/monaco-editor -->
-**monaco-editor version:** 0.X.Y
-**Browser:**
-**OS:** 
-
-**Steps or JS usage snippet reproducing the issue:**
-