diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index f7949a11f2..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-If you encounter a bug or you have a support question, please try to fill out some of the information below.
-Generally speaking, the information below is meant to help debugging issues but is no prerequisite for opening an issue.
--->
-
-### Your environment
-Output of `haskell-language-server --probe-tools` or `haskell-language-server-wrapper --probe-tools`:
-<!-- This command is available since version `>= 0.4.0.0` -->
-```sh
-
-```
-Which OS do you use:
-<!-- Windows, MacOS, Ubuntu, ArchLinux, etc... -->
-Which lsp-client do you use:
-<!-- Neovim, emacs, VS Codium, etc... -->
-Describe your project (alternative: link to the project):
-<!-- stack.yaml, package.yaml, *.cabal files, cabal.project -->
-Contents of `hie.yaml`:
-```yaml
-
-```
-
-### Steps to reproduce
-<!-- Tell us how to reproduce this issue. -->
-
-### Expected behaviour
-<!-- Tell us what should happen. -->
-
-### Actual behaviour
-<!-- Tell us what happens instead. -->
-
-### Include debug information
-Execute in the root of your project the command `haskell-language-server --debug .` and paste the logs here:
-
-<details>
-<summary>
-Debug output:
-</summary>
-
-```
-<paste your logs here>
-```
-</details>
-
-Paste the logs from the lsp-client, e.g. for [VS Code](https://github.com/haskell/vscode-haskell#troubleshooting)
-
-<details>
-<summary>
-LSP logs:
-</summary>
-
-```
-<paste your logs here>
-```
-</details>
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..5674ee4522
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,57 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'status: needs triage, type: bug'
+assignees: ''
+
+---
+
+<!--
+Before opening an issue, please take a look at the [troubleshooting guide](https://haskell-language-server.readthedocs.io/en/latest/troubleshooting.html). This explains some common issues and will also help you to find the information that the issue template asks for.
+
+When filing an issue, please fill out as much of the information below as you can. This helps us to debug your issue, but is not required!
+-->
+
+### Your environment
+
+Which OS do you use:
+<!-- Windows, MacOS, Ubuntu, ArchLinux, etc... -->
+Which lsp-client do you use:
+<!-- Neovim, emacs, VS Codium, etc... -->
+Describe your project (alternative: link to the project):
+<!-- stack.yaml, package.yaml, *.cabal files, cabal.project, hie.yaml -->
+
+### Steps to reproduce
+<!-- Tell us how to reproduce this issue. -->
+
+### Expected behaviour
+<!-- Tell us what should happen. -->
+
+### Actual behaviour
+<!-- Tell us what happens instead. -->
+
+### Include debug information
+Execute in the root of your project the command `haskell-language-server-wrapper --debug .` and paste the logs here:
+(if you are using the vscode extension check the executable location [here](https://github.com/haskell/vscode-haskell#downloaded-binaries))
+<details>
+<summary>
+Debug output:
+</summary>
+
+```
+<paste your logs here>
+```
+</details>
+
+Paste the logs from the lsp-client, you can check instructions about for VS Code [here](https://github.com/haskell/vscode-haskell#troubleshooting)
+
+<details>
+<summary>
+LSP logs:
+</summary>
+
+```
+<paste your logs here>
+```
+</details>
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..475681f707
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'status: needs triage, type: 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. -->