diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 013173a58..bd83bab40 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,25 +4,28 @@ 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.
+- [ ] I have searched the existing issues and I am 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 the problem is including your motivation for the request,
+i.e. "For the purpose of [...] I am missing a solution that will [...]."
+
+**Describe the solution you 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.
+**Describe alternatives you considered**
+
+A clear and concise description of any alternative solutions or features you considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+
+Add any other context or screenshots about the feature request here or links to relevant forum thread or similar
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 3943286e8..fe7ff8381 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,18 +1,15 @@
 ---
 name: Question
-about: Ask a question about OPNsense, but before you do, please consider using our
-  forum
+about: Ask a question about OPNsense, but before you do, please consider using our forum
 title: ''
 labels: support
 assignees: ''
-
 ---
-
 **Important notices**
+
 Our forum is located at https://forum.opnsense.org , please consider joining discussions there in stead of using GitHub for these matters.
 
 Before you ask a new question, 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.
+- [ ] I have searched the existing issues and I am convinced that mine is new.