diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index ef999eded..69d8e76d9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,6 @@
 name: Bug report
 description: File a bug/issue
-title: "<title>"
-labels: ["Bug", "Needs Triage"]
+labels: ["bug", "need-to-investigate"]
 body:
 - type: checkboxes
   attributes:
@@ -54,6 +53,7 @@ body:
   attributes:
     label: Describe the bug
     description: A clear and concise description of what the bug is.
+    render: markdown
   validations:
     required: true
 - type: textarea
@@ -75,6 +75,7 @@ body:
 - type: textarea
   attributes:
     label: Additional context
+    render: markdown
     description: |
       Links? References? Anything that will give us more context about the issue you are encountering!
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 3e8b8ef55..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Create a feature request
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Motivation**
-
-A single (short) use case, scenario, or other argument used in support of this *feature*.
-
-**Description**
-
-A clear and concise description of this *feature*.
-
-**Examples/Questions**
-
-- Using examples to profile how you imagine the *feature* should be
-- Raising questions to highlight the uncertain design for the *feature*.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..263c37423
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,29 @@
+name: Feature request
+description: Create a feature request
+labels: ["enhancement", "need-to-investigate"]
+body:
+- type: textarea
+  attributes:
+    label: Motivation
+    render: markdown
+    description: |
+      A brief use case, scenario, or other argument used in support of this *feature*.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Description
+    render: markdown
+    description: |
+      A clear and concise description of this *feature*.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: More Examples/Questions
+    render: markdown
+    description: |
+      - Using examples to profile how you imagine the *feature* should be
+      - Raising questions to highlight the uncertain design for the *feature*.
+  validations:
+    required: false