diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 28807103e..e4f754d66 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve OpenZFS
 title: ''
-labels: ''
+labels: 'Type: Defect'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index a8b9ea118..9b50a4a3d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -10,7 +10,7 @@ assignees: ''
 <!--
 Thank you for suggesting a feature.
 
-Please check the our issue tracker before opening a new feature request.
+Please check our issue tracker before opening a new feature request.
 Filling out the following template will help other contributors better understand your proposed feature.
 -->
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 000000000..0aee9f7c3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,37 @@
+---
+name: Code Question
+about: Ask a question about the code
+title: ''
+labels: 'Type: Question'
+assignees: ''
+
+---
+
+<!--
+Thank you for taking an interest in the OpenZFS codebase.
+
+Please be aware that most questions are preferably asked in the mailing list first.
+This form is primarily meant for asking questions about the code itself.
+
+Please also check our issue tracker before opening a new question.
+Filling out the following template will help other contributors better understand your question.
+-->
+
+### Ask your question!
+
+<!--
+Please provide a clear and concise question.
+-->
+
+### Which portion of the codebase does your question involve?
+
+<!--
+Optional: Please describe what portion of the codebase your issue involved.
+Example: "Testsuite", "Buildbots", "CLI", a code snippet etc.
+-->
+
+### Additional context
+
+<!--
+Any additional information you want to add?
+-->