diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..f97de313a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,45 @@
+---
+name: Bug report
+about: Create a report to help us improve OPNsense
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Important notices**
+Before you add a new report, we ask you kindly to acknowledge the following:
+
+[-] I have read the contributing guide lines at https://github.com/opnsense/core/blob/master/CONTRIBUTING.md
+
+[-] I have searched the existing issues and I'm convinced that mine is new.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Relevant log files**
+If applicable, information from log files supporting your claim.
+
+**Additional context**
+Add any other context about the problem here.
+
+**Environment**
+Software version used and hardware type if relevant.
+e.g.: 
+
+OPNsense 19.1.1 (amd64, OpenSSL).  
+Intel® Xeon™ E3-1225V5 3.3Ghz Quad Core
+Network Intel® I210-AT
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..aaf99fcc9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,29 @@
+---
+name: Feature request
+about: Suggest an idea for OPNsense
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Important notices**
+Before you add a new report, we ask you kindly to acknowledge the following:
+
+[-] I have read the contributing guide lines at https://github.com/opnsense/core/blob/master/CONTRIBUTING.md
+
+[-] I have searched the existing issues and I'm convinced that mine is new.
+
+**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. 
+(e.g. I would like an input field in the `/ui/firewall/alias` which would add .... to ....)
+
+**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.