diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..fa9052c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Please make sure to go through the recommendations before opening a bug report:**
+
+[https://github.com/mathieucarbou/AsyncTCP?tab=readme-ov-file#important-recommendations](https://github.com/mathieucarbou/AsyncTCP?tab=readme-ov-file#important-recommendations)
+
+**Description**
+
+A clear and concise description of what the bug is.
+
+**Board**
+
+esp32dev, esp32s3, etc
+
+**Ethernet adpater used ?**
+
+If yes, please specify which one
+
+**Stack trace**
+
+Please provide the stack trace here taken with `monitor_filters = esp32_exception_decoder`.
+**Any issue opened with a non readable stack trace will be ignored because not helpful at all.**
+
+**Additional notes**
+
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..634179c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,10 @@
+---
+name: Question
+about: Describe your question
+title: "[Q]"
+labels: question
+assignees: ''
+
+---
+
+