diff --git a/.github/ISSUE_TEMPLATE/custom-form.yml b/.github/ISSUE_TEMPLATE/custom-form.yml
new file mode 100644
index 0000000..174cee4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom-form.yml
@@ -0,0 +1,16 @@
+name: Custom Issue
+description: Custom issue template
+title: "Issue: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Note:** For Bug Reports or Feature Requests, please use the dedicated forms instead of this custom issue template.
+  - type: textarea
+    id: custom-description
+    attributes:
+      label: Description
+      description: A clear and detailed description of the issue.
+      placeholder: Please use provide a detailed and specific description of your issue.
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request-form.yml b/.github/ISSUE_TEMPLATE/feature_request-form.yml
new file mode 100644
index 0000000..c9c6e63
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request-form.yml
@@ -0,0 +1,37 @@
+name: Feature Request
+description: Suggest a new feature or improvement
+title: "Feature: "
+labels: ["feature"]
+body:
+  - type: textarea
+    id: problem-description
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: A clear and concise description of what the problem is. 
+      placeholder: Describe the problem your feature request addresses.
+    validations:
+      required: true
+  - type: textarea
+    id: solution-description
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+      placeholder: Describe your proposed solution.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+      placeholder: List any alternative solutions or features.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+      placeholder: Any additional information or screenshots.
+    validations:
+      required: false