diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index d7790cc000..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- 
-     IF YOUR ISSUE CONCERNS RUNNING/DEBUGGING JAVA CODE, 
-     PLEASE OPEN YOUR TICKET IN https://github.com/microsoft/vscode-java-debug/issues 
--->
-
-[provide a description of the issue]
-
-##### Environment
-- Operating System:
-- JDK version:
-- Visual Studio Code version:
-- Java extension version:
-
-##### Steps To Reproduce
-1. [step 1]
-2. [step 2]
-
-[Please attach a sample project reproducing the error]
-[Please attach logs](https://github.com/redhat-developer/vscode-java/wiki/Troubleshooting#enable-logging)
-
-##### Current Result
-
-##### Expected Result
-
-##### Additional Information
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..ab4541af81
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: 🐛 Bug report
+about: Report an issue about editing, completion, navigation, build, etc.
+title: ''
+labels: ['bug']
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the problem is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. [step 1]
+2. [step 2]
+3. ...
+
+[Please attach a sample project reproducing the error]
+[Please attach logs. See https://github.com/redhat-developer/vscode-java/wiki/Troubleshooting#enable-logging]
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment**
+- Operating System:
+- JDK version:
+- Visual Studio Code version:
+- Java extension version:
+
+**Additional Information**
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..4304c84774
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🧪 Issue about running unit tests
+    url: https://github.com/microsoft/vscode-java-test/issues/new
+    about: If your problem is about running or debugging unit tests, open an issue in the Test Runner for Java extension.
+  - name: 🏃‍♂️ Issue about running or debugging application code
+    url: https://github.com/microsoft/vscode-java-debug/issues/new
+    about: If your problem is about running or debugging Java application code, open an issue in the Debugger for Java extension.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..36bddafeb0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: 💡 Feature request
+about: Suggest a new feature or improvement for editing, completion, navigation, build, etc.
+title: ''
+labels: ['enhancement']
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
\ No newline at end of file