diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..61e01bfa5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: ":bug: Bug report"
+about: Report a reproducible bug or regression
+labels: bug, needs triage
+---
+
+<!--
+IMPORTANT: Please use the [discussion forum](https://github.com/strongswan/strongswan/discussions)
+for questions and configuration problems etc., only report actual bugs here.
+Your issue will otherwise be closed immediately.
+-->
+
+**System (please complete the following information):**
+ - OS: [e.g. Ubuntu 20.04]
+ - Kernel version (if applicable): [e.g. 5.10]
+ - strongSwan version(s): [e.g. 5.9.2]
+ - Tested/confirmed with the latest version: [yes/no]
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ...
+2. ...
+3. ...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Logs/Backtraces**
+If applicable, add logs or backtraces to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..55a1b5a08
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: ":thinking: Question and Help"
+    url: https://github.com/strongswan/strongswan/discussions
+    about: This issue tracker is not for support questions. Please refer to the strongSwan community's help and discussion forum
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..5ad43f260
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+labels: enhancement, needs triage
+---
+
+<!--
+IMPORTANT: Please consider discussing the requested feature in the
+[forum](https://github.com/strongswan/strongswan/discussions) first.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**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, workarounds or
+features you've considered.
+
+**Additional context**
+Add any other context about the feature request here.