diff --git a/.github/ISSUE_TEMPLATE/an-idea-or-question.md b/.github/ISSUE_TEMPLATE/an-idea-or-question.md
new file mode 100644
index 000000000..40bd85f46
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/an-idea-or-question.md
@@ -0,0 +1,20 @@
+---
+name: An idea or question
+about: Suggest an idea or change for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear description of what the problem is. Ex. I'm confused by, or would like to know how to...
+
+**Describe the solution you'd like**
+A description of what you'd expect to happen.
+
+**Describe alternatives you've considered**
+Are there any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 87995c9e9..7bd1a0c36 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,4 +19,4 @@ assignees: ''
 
 <!-- On Unix please post the output of "uname -a" -->
 
-### Any other comments
\ No newline at end of file
+### Any other comments
diff --git a/.github/ISSUE_TEMPLATE/security_report.md b/.github/ISSUE_TEMPLATE/security_report.md
index 52f39f530..c062a9be4 100644
--- a/.github/ISSUE_TEMPLATE/security_report.md
+++ b/.github/ISSUE_TEMPLATE/security_report.md
@@ -2,14 +2,11 @@
 name: Security report
 about: Notify us of a security issue in Kanidm
 title: ''
-labels: 
- - 'security'
- - 'oh no~'
+labels: oh no~, security
 assignees: ''
 
 ---
 
-
 <!-- 
 
 Please see the security policy in SECURITY.md, located in the root of the repository.
@@ -27,4 +24,3 @@ Thank you!
 ### Operating System / Version
 
 <!-- On Unix please post the output of "uname -a" -->
-