diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a503772..a8799d0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,10 +10,15 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
+**System info**
+
+BeeRef version number:
+Your operating system:
+
 **To Reproduce**
 Steps to reproduce the behavior:
-1. 
-2. 
+1.
+2.
 3.
 
 **Expected behavior**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..aaa20a5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,13 @@
+---
+name: Feature request
+about: Create a report to help us improve
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Describe the feature**
+A clear and concise description of what feature you want.
+
+ONLY ONE FEATURE REQUEST PER REPORT! Even if they are related! You may open as many feature requests as you want.
\ No newline at end of file