diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index de36dd8d7c..ddaa420c7e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,6 +22,7 @@ body:
         - Safari
         - All
         - Other
+        - N/A
   - type: dropdown
     id: os
     attributes:
@@ -33,6 +34,9 @@ body:
         - Android
         - iOS
         - Linux
+        - All
+        - Other
+        - N/A
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index a38c8200d4..778d1a616d 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -7,13 +7,6 @@ body:
     id: proposal
     attributes:
       label: Proposal
-      description: Provide detailed information about your feature idead including references to related work.
-    validations:
-      required: true
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation and context
-      description: Tell us why you consider this feature or change is needed or would be helpful, and what problems it may help solve.
+      description: Provide detailed information about your feature ideas including references to related work.
     validations:
       required: true