diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 76b066980fb..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature request - General feature
-about: Request the addition of a new feature/functionality
-title: ''
-labels: feature request
-assignees: ''
-
----
-
-**Description of the desired feature**
-
-
-
-<!-- Please be as detailed as you can in your description. If possible, include an example of how you would like to use this feature (even better if it's a code example). -->
-
-
-**Are you willing to help implement and maintain this feature?** Yes/No
-
-<!-- Every feature we add is code that we will have to maintain and keep updated. This takes a lot of effort. If you are willing to be involved in the project and help maintain your feature, it will make it easier for us to accept it. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 00000000000..71ca1be6091
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,23 @@
+name: Feature request - General feature
+description: Request the addition of a new feature/functionality
+labels: ["feature request"]
+body:
+  - type: textarea
+    attributes:
+      label: "Description of the desired feature"
+      description: |
+        Please be as detailed as you can in your description.
+        If possible, include an example of how you would like to use this feature (even better if it's a code example).
+  - type: dropdown
+    id: help
+    attributes:
+      label: Are you willing to help implement and maintain this feature?
+      description: |
+        Every feature we add is code that we will have to maintain and keep updated. This takes a lot of effort.
+        If you are willing to be involved in the project and help maintain your feature, it will make it easier for us to accept it.
+      options:
+        - "No"
+        - "Yes"
+        - "Maybe"
+    validations:
+      required: true