diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index d3dc9a8..2597189 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -4,7 +4,6 @@ title: "🐛 "
 labels: [🐛 bug]
 body:
   - type: textarea
-    id: what-are-you-trying-to-do
     attributes:
       label: What were you trying to do?
       description: Explain what you are trying to do.
@@ -12,7 +11,6 @@ body:
     validations:
       required: true
   - type: textarea
-    id: what-happened-instead
     attributes:
       label: What happened instead?
       description: Explain what happened instead of the desired outcome. Did something crash?
@@ -20,13 +18,11 @@ body:
     validations:
       required: true
   - type: textarea
-    id: logs
     attributes:
       label: Relevant log output
       description: Please copy and paste any relevant log output (Xcode Logs/Android Studio Logcat). This will be automatically formatted into code, so no need for backticks.
       render: shell
   - type: dropdown
-    id: platforms
     attributes:
       label: What Platforms are you seeing this Problem on?
       multiple: true
@@ -36,7 +32,6 @@ body:
     validations:
       required: true
   - type: input
-    id: version
     attributes:
       label: VisionCamera Version
       description: Which version of react-native-vision-camera are you using?
@@ -44,7 +39,6 @@ body:
     validations:
       required: true
   - type: checkboxes
-    id: terms
     attributes:
       label: Additional information
       description: Please check all the boxes that apply
@@ -54,3 +48,5 @@ body:
           required: true
         - label: I agree to follow this project's [Code of Conduct](https://github.com/mrousavy/react-native-vision-camera/blob/main/CODE_OF_CONDUCT.md)
           required: true
+        - label: I searched for [similar issues in this repository](https://github.com/mrousavy/react-native-vision-camera/issues) and found none.
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
index e857c54..1c04022 100644
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -34,3 +34,5 @@ body:
       options:
         - label: I agree to follow this project's [Code of Conduct](https://github.com/mrousavy/react-native-vision-camera/blob/main/CODE_OF_CONDUCT.md)
           required: true
+        - label: I searched for [similar feature requests in this repository](https://github.com/mrousavy/react-native-vision-camera/issues?q=is%3Aopen+is%3Aissue+label%3A%22✨+enhancement%22) and found none.
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.md b/.github/ISSUE_TEMPLATE/QUESTION.md
deleted file mode 100644
index 2cba6f1..0000000
--- a/.github/ISSUE_TEMPLATE/QUESTION.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: "❓ Question"
-about: Ask a question about the library
-title: "❓ "
-labels: ❓ question
-assignees: ''
-
----
-
-<!--
-                      ❤️ Thank you for your contribution! ❤️
-                  Remember that you can use this project FOR FREE.
-      Badly written questions are less likely to be answered than well written ones.
-        BEFORE asking a question, make sure you have read the documentation READMEs.
--->
-
-
-## Question
-
-<!--
-                                              Ask a question about the library.
-    Make sure to be as clear as possible, so that I (or other maintainers) can understand your question and help you out.
--->
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml
new file mode 100644
index 0000000..68f10c0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/QUESTION.yml
@@ -0,0 +1,31 @@
+name: ❓ Question
+description: Ask a Question about this library
+title: "❓ "
+labels: [❓ question]
+body:
+  - type: textarea
+    attributes:
+      label: Question
+      description: Ask a question about the library or ask for help/advice. Make sure to be as detailed as possible, since well written questions are more likely to be picked up than badly written ones.
+      placeholder: How do I take a photo?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What I tried
+      description: (Optional) Explain what alternatives/workarounds you tried.
+      placeholder: I tried to use `Camera.takePhoto()`
+  - type: checkboxes
+    attributes:
+      label: Additional information
+      description: Please check all the boxes that apply
+      options:
+        - label: I am using Expo
+        - label: I have read the [Troubleshooting Guide](https://mrousavy.github.io/react-native-vision-camera/docs/guides/troubleshooting)
+          required: true
+        - label: I agree to follow this project's [Code of Conduct](https://github.com/mrousavy/react-native-vision-camera/blob/main/CODE_OF_CONDUCT.md)
+          required: true
+        - label: I agree to follow this project's [Code of Conduct](https://github.com/mrousavy/react-native-vision-camera/blob/main/CODE_OF_CONDUCT.md)
+          required: true
+        - label: I searched for [similar questions in this repository](https://github.com/mrousavy/react-native-vision-camera/issues?q=is%3Aopen+is%3Aissue+label%3A%22❓+question%22) as well as [in the discussions](https://github.com/mrousavy/react-native-vision-camera/discussions) and found none.
+          required: true