diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..6a35ff74
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: needs analysis
+assignees: ''
+
+---
+
+#### Description
+<!-- A clear and concise description of what the bug is.
+Anything related to actual message definitions in ebusd-configuration, serial bridge in ebusd-esp, or adapter v3/v2 do not belong here! Use the appropriate repository for those. -->
+
+#### Actual behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+#### Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+#### Environment
+- OS: <!-- e.g. Ubuntu 20.04 -->
+- Architecture: <!-- e.g. x64, arm, i386 -->
+- ebusd version: <!-- e.g. 21.3 -->
+- ebusd start arguments: <!-- e.g. copy the EBUSD_OPTS line from /etc/default/ebusd -->
+- Integration:
+  - [ ] TCP <!-- cmdline client like ebusctl or netcat -->
+  - [ ] HTTP
+  - [ ] MQTT
+  - [ ] other
+
+#### Logs
+<!-- Add some logging e.g. relevent lines found in /var/log/ebusd.log and ensure to wrap it with:
+```txt
+your log lines
+```
+-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..f0e8dba8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: needs analysis
+assignees: ''
+
+---
+
+#### Description
+<!-- A clear and concise description of the requested feature, additional behaviour, different functionality...
+Anything related to actual message definitions in ebusd-configuration, serial bridge in ebusd-esp, or adapter v3/v2 do not belong here! Use the appropriate repository for those. -->
+
+#### Environment
+- OS: <!-- e.g. Ubuntu 20.04 -->
+- Architecture: <!-- e.g. x64, arm, i386 -->
+- ebusd version: <!-- e.g. 21.3 -->
+- ebusd start arguments: <!-- e.g. copy the EBUSD_OPTS line from /etc/default/ebusd -->
+- Integration:
+  - [ ] TCP <!-- cmdline client like ebusctl or netcat -->
+  - [ ] HTTP
+  - [ ] MQTT
+  - [ ] other