diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c63a37d..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug Report
-about: Create a report to help us improve
-title: "[Bug]: "
-labels: ["bug"]
-assignees: ""
----
-
-**Describe the bug** (Required)
-A clear and concise description of what the bug is.
-
-**To Reproduce** (Required)
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior** (Required)
-A clear and concise description of what you expected to happen.
-
-**OS** (Optional)
- - Operating System: [e.g. Windows 11, macOS 15.x, Ubuntu 22.04]
-
-**Provider** (Required for AI-related issues)
- - AI Provider/s used: [e.g. Anthropic, OpenAI, Google Gemini]
- - Provider that caused the error (if specific): [e.g. Only occurs with OpenAI, works fine with Anthropic]
-
-**Additional context** (Optional)
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..8c3ea45
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,55 @@
+name: 'Bug Report'
+description: 'Create a report to help us improve'
+title: "[Bug]: "
+labels: ["bug"]
+assignees: ""
+body:
+  - type: 'textarea'
+    id: 'bug-description'
+    attributes:
+      label: 'Describe the bug'
+      description: 'A clear and concise description of what the bug is.'
+    validations:
+      required: true
+  - type: 'textarea'
+    id: 'reproduce'
+    attributes:
+      label: 'To Reproduce'
+      description: 'Steps to reproduce the behavior:'
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: 'textarea'
+    id: 'expected-behavior'
+    attributes:
+      label: 'Expected behavior'
+      description: 'A clear and concise description of what you expected to happen.'
+    validations:
+      required: true
+  - type: 'textarea'
+    id: 'os'
+    attributes:
+      label: 'OS'
+      description: 'e.g. Windows 11, macOS 15.x, Ubuntu 22.04'
+    validations:
+      required: false
+  - type: 'textarea'
+    id: 'provider'
+    attributes:
+      label: 'Provider (Required for AI-related issues)'
+      description: |
+        - AI Provider/s used: [e.g. Anthropic, OpenAI, Google Gemini]
+        - Provider that caused the error (if specific): [e.g. Only occurs with OpenAI, works fine with Anthropic]
+    validations:
+      required: false
+  - type: 'textarea'
+    id: 'additional-context'
+    attributes:
+      label: 'Additional context'
+      description: 'Add any other context about the problem here.'
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
deleted file mode 100644
index 5006246..0000000
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Enhancement
-about: Suggest an enhancement for an existing feature
-title: "[Enhancement]: "
-labels: ["enhancement"]
-assignees: ""
----
-
-**What is the enhancement you are proposing?** (Required)
-A clear and concise description of the enhancement.
-
-**Additional context** (Optional)
-Add any other context or screenshots about the enhancement here.
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
new file mode 100644
index 0000000..c834c46
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,20 @@
+name: 'Enhancement'
+description: 'Suggest an enhancement for an existing feature'
+title: "[Enhancement]: "
+labels: ["enhancement"]
+assignees: ""
+body:
+  - type: 'textarea'
+    id: 'enhancement-description'
+    attributes:
+      label: 'What is the enhancement you are proposing?'
+      description: 'A clear and concise description of the enhancement.'
+    validations:
+      required: true
+  - type: 'textarea'
+    id: 'additional-context'
+    attributes:
+      label: 'Additional context'
+      description: 'Add any other context or screenshots about the enhancement here.'
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 01d68ce..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for this project
-title: "[Feature]: "
-labels: ["feature request"]
-assignees: ""
----
-
-**Is your feature request related to a problem? Please describe.** (Required)
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like** (Required)
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered** (Optional)
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context** (Optional)
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..46817ac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,34 @@
+name: 'Feature Request'
+description: 'Suggest an idea for this project'
+title: "[Feature]: "
+labels: ["feature request"]
+assignees: ""
+body:
+  - type: 'textarea'
+    id: 'related-problem'
+    attributes:
+      label: 'Is your feature request related to a problem? Please describe.'
+      description: "A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]"
+    validations:
+      required: true
+  - type: 'textarea'
+    id: 'solution'
+    attributes:
+      label: "Describe the solution you'd like"
+      description: 'A clear and concise description of what you want to happen.'
+    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.'
+    validations:
+      required: false
+  - type: 'textarea'
+    id: 'additional-context'
+    attributes:
+      label: 'Additional context'
+      description: 'Add any other context or screenshots about the feature request here.'
+    validations:
+      required: false