diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
deleted file mode 100644
index 725f7dd..0000000
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index d69fb74..2adcf5a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -4,7 +4,7 @@ labels: [":bug: bug"]
 body:
   - type: markdown
     attributes:
-      value: |
+      value: >
         Thanks for taking the time to fill out this bug report!
   - type: textarea
     id: what-happened
@@ -34,11 +34,12 @@ body:
     id: how-to-reproduce
     attributes:
       label: 🔬 How could we reproduce it?
-      description: |
+      description: >
         It order to fix the problem, we need to be able to reproduce it.
         A [Minimal Reproducible Example](https://stackoverflow.com/help/minimal-reproducible-example) can be really helpful for anyone
         trying to diagnose and fix the problem.
 
+
         Please outline the steps below:
       placeholder: |
         1. Install '...' version '...'
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 0000000..d018f25
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,38 @@
+name: Feature Request
+description: Suggest an idea for this project
+labels: [":zap: enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: >
+        Thanks for taking the time to suggest an idea for this project!
+  - type: textarea
+    id: problem
+    attributes:
+      label: 🤔 What's the problem you're trying to solve?
+      description: >
+        A clear and concise description of what the problem is e.g. I'm
+        always frustrated when ...
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: ✨ What's your proposed solution?
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: ⛏ Have you considered any alternatives or workarounds?
+      description: >
+        A clear and concise description of any alternative solutions or features
+        you've considered.
+  - type: textarea
+    id: context
+    attributes:
+      label: 📚 Any additional context?
+      description: >
+        Add any other context, references or screenshots about the feature
+        request here.