diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..e7332aa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,28 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
+---
+
+<!-- Make sure to read the documentaion (https://github.com/lubeda/EspHoMaTriXv2/blob/main/README.md) before opening an issue. -->
+
+# Feature Request
+
+### Is your feature request related to a problem?
+
+If so, then add a clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+### Describe the solution / feature you'd like
+
+A clear and concise description of what you want to happen. Add scribbles to explain your wish.
+
+### 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.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..a882e40
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,30 @@
+---
+name: Question
+about: Open an issue to ask something about EspHoMaTriXv2
+title: "[QUESTION]"
+labels: help wanted, question
+assignees: ''
+
+---
+
+<!-- Make sure to read the documentaion (https://github.com/lubeda/EspHoMaTriXv2/blob/main/README.md) before asking questions. -->
+
+# Question
+
+Add here your question.
+
+## Additional information
+
+- used Hardware:
+  - ESP32 or ESP8266
+  - EspHoMaTriXv2 version: [e.g. 2023.5.0]
+
+## Logs
+
+```text
+(optional) Add relevant logs which could help tackle the problem.
+```
+
+## Additional context
+
+Add any other context about the problem here.