diff --git a/.github/ISSUE_TEMPLATE/2_Feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md
deleted file mode 100644
index adcdc30fd8b..00000000000
--- a/.github/ISSUE_TEMPLATE/2_Feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: 🚀 Feature Request
-about: Suggest an idea for this project
-labels: feature-request
-
----
-
-For general questions please use [PX4 Discuss](http://discuss.px4.io/) or Discord (you can find an invite link on this project README).
-
-## Describe problem solved by the proposed feature
-A clear and concise description of the problem, if any, this feature will solve. E.g. I'm always frustrated when ...
-
-## Describe your preferred solution
-A clear and concise description of what you want to happen.
-
-## Describe possible alternatives
-A clear and concise description of alternative solutions or features you've considered.
-
-## Additional context
-Add any other context or screenshots for the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000000..0b128080480
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,35 @@
+name: 🚀 Feature Request
+description: Suggest an idea for this project
+labels: [feature-request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Please note that feature requests are not 'fire and forget'.**
+        It is a lot more likely that the feature you would like to have will be implemented if you keep watching your feature request, and provide more details to developers looking into implementing your feature, and help them with testing.
+
+  - type: textarea
+    attributes:
+      label: Describe problem solved by the proposed feature
+      description: A clear and concise description of the problem, if any, this feature will solve. E.g. I'm always frustrated when ...
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe your preferred solution
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe possible alternatives
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots for the feature request here.