diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 0000000..02b9d1f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,67 @@
+name: Bug Report
+description: bug report
+title: "🐛 [bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you if we need more info?
+      placeholder: ex. email@example.com
+    validations:
+      required: false
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      options:
+        - 2.9.5
+        - 2.9.4
+        - 2.9.3
+        - 2.9.2
+        - 2.9.1
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: device_info 
+    attributes:
+      label: What device are you seeing the problem on?
+      multiple: true
+      options:
+        - Samsung
+        - Google Pixel
+        - Xiaomi (HyperOS)
+        - RedMagic
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: duplication
+      description: By submitting this issue, you didn't saw any issues duplicate with this issue
+      options:
+        - label: I Agree
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
new file mode 100644
index 0000000..03db23c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -0,0 +1,54 @@
+name: Enhancement Request
+description: Suggest a new feature or an improvement to an existing one.
+title: "[🚀]: "
+labels: ["enhancement"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: "## 🚀 Enhancement Request"
+
+  - type: input
+    id: summary
+    attributes:
+      label: "Summary"
+      description: "Briefly summarize the enhancement request."
+      placeholder: "e.g., Add filter options to the search function"
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: "Problem Description"
+      description: "Explain why this enhancement is needed or describe the problem with the current functionality."
+      placeholder: "e.g., The search function currently lacks filtering options, making it hard to find specific results."
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: "Proposed Solution"
+      description: "Describe how this enhancement should be implemented."
+      placeholder: "e.g., Add dropdown filters for categories and date ranges in the search UI."
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: "Alternatives Considered"
+      description: "Have you considered any alternative solutions? If so, describe them here."
+      placeholder: "e.g., Instead of dropdown filters, allow users to enter custom search queries."
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: "Additional Context"
+      description: "Provide any other context, screenshots, or references related to this enhancement."
+      placeholder: "e.g., Example screenshots from similar applications."
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: "Checklist"
+      description: "Please check the following before submitting:"
+      options:
+        - label: "I have searched for similar enhancement requests."
+        - label: "I have provided sufficient detail in the request."
+        - label: "I understand that not all requests may be accepted."