diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index da3bd5af8..c68352527 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: 🚀 Feature request
 description: Suggest an idea for this project
-title: "<One feature request per issue>"
+title: One feature request per issue
 labels: ['type: feature']
 body:
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/non_core.yml b/.github/ISSUE_TEMPLATE/non_core.yml
new file mode 100644
index 000000000..c863382fa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/non_core.yml
@@ -0,0 +1,26 @@
+name: non-core improvement proposal
+description: Suggest an idea for this project
+title: Idea
+labels: ['type: refactor']
+body:
+  - type: checkboxes
+    id: type
+    attributes:
+      label: Type
+      options:
+        - label: Refactor
+        - label: Test
+  - type: textarea
+    id: why
+    attributes:
+      label: Why?
+      description: |
+        A clear and concise description of why you want to propose this improvement.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        If applicable, add context that helps us understand the idea better.
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 000000000..3f382be2e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,21 @@
+name: 🤔 Question
+description: |
+  Letting us know your question will help us improve the project or document.
+  If you think it is a bug, please use the bug report template instead.
+title: Your question
+labels: ['type: question']
+body:
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+      description: |
+        A clear description of your question.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        If applicable, add context that helps us understand your question better.