diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 62b35ec6a..a0dd49654 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -42,14 +42,13 @@ Bug report?
 
 <!--Start your bug report below this line-->
 
-# Bug Report
 ## What happened
 
 ## What did you expect to happen
 
 ## How to reproduce it (minimal and precise)
 
-## Debug Info
+## Debug info
 Zigbee2MQTT version:
 Adapter hardware: CC2531, CC2530, CC26X2R1, CC1352P-2, Conbee II
 Adapter firmware version:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..f0ed8b766
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Home Assistant addon issues
+    url: https://github.com/danielwelch/hassio-zigbee2mqtt/issues
+    about: Issues related to the Home Assistant addon.
+  - name: FAQ
+    url: https://www.zigbee2mqtt.io/information/FAQ.html
+    about: Frequently asked questions.
+  - name: Support Chat
+    url: https://discord.gg/NyseBeK
+    about: Chat for feedback, questions and troubleshooting.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/device_support.md b/.github/ISSUE_TEMPLATE/device_support.md
new file mode 100644
index 000000000..91b4595ef
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/device_support.md
@@ -0,0 +1,14 @@
+---
+name: Device support request
+about: Request support for a new device
+title: ''
+labels: device support
+assignees: ''
+
+---
+
+## Information about the device + link
+..
+
+## data/database.db entry of the device
+..
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..f142943f9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+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.