diff --git a/.github/ISSUE_TEMPLATE.yml b/.github/ISSUE_TEMPLATE.yml
index b7420e21..0944e98e 100644
--- a/.github/ISSUE_TEMPLATE.yml
+++ b/.github/ISSUE_TEMPLATE.yml
@@ -33,12 +33,19 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
-        - 2.9.3
-        - 2.9.3-2
-        - 2.9.4
+        - 2.9.4-2
       default: 0
     validations:
       required: true
+  - type: dropdown
+    id: 3rd-party-hardware
+    attributes:
+      label: 3rd Party Hardware
+      description: Are you using any 3rd party hardware? By selecting "Yes", you agree that you have tested the issue without the 3rd party hardware. And acknowledge that the issue may be related to the 3rd party hardware, for which we cannot provide full support.
+      options:
+        - Yes
+        - No
+      default: 1
   - type: textarea
     id: logs
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 0c6e8a70..0944e98e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -33,12 +33,19 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
-        - 2.9.3
-        - 2.9.3-2
-        - 2.9.4
+        - 2.9.4-2
       default: 0
     validations:
       required: true
+  - type: dropdown
+    id: 3rd-party-hardware
+    attributes:
+      label: 3rd Party Hardware
+      description: Are you using any 3rd party hardware? By selecting "Yes", you agree that you have tested the issue without the 3rd party hardware. And acknowledge that the issue may be related to the 3rd party hardware, for which we cannot provide full support.
+      options:
+        - Yes
+        - No
+      default: 1
   - type: textarea
     id: logs
     attributes:
@@ -49,7 +56,7 @@ body:
     id: terms
     attributes:
       label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/jayofelony/pwnagotchi/blob/noai/CODE_OF_CONDUCT.md). 
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/jayofelony/pwnagotchi/blob/noai/CODE_OF_CONDUCT.md).
       options:
         - label: I agree to follow this project's Code of Conduct
           required: true