diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 6a532c1..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug Report
-about: Create a report to help improve burpference
-title: '[BUG] '
-labels: bug
-assignees: ''
----
-
-### Bug Description
-A clear and concise description of the bug.
-
-### Steps to Reproduce
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-### Expected Behavior
-A clear description of what you expected to happen.
-
-### Screenshots
-If applicable, add screenshots to help explain your problem.
-
-### Environment
-- OS: [e.g. Windows 10, macOS 12.0]
-- Browser: [e.g. Chrome 96]
-- Extension Version: [e.g. 1.0.0]
-- URL being tested: [if applicable]
-
-### Additional Context
-Add any other context about the problem here.
-
-### Console Output
-```
-Paste any relevant console output here
-```
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 0000000..a050e88
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,62 @@
+---
+name: "🚨 Bug Report"
+description: File a bug report
+title: "🚨 [BUG] - <title>"
+labels: ["bug", "triage"]
+assignees:
+  - octocat
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: |
+        Steps to reproduce the behavior:
+        1.
+        2.
+        3.
+
+        Expected behavior:
+        ...
+
+        Actual behavior:
+        ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: possible-fix
+    attributes:
+      label: Any suggestions for fixing this bug?
+      description: If you have an idea to fix this bug, we'd love to hear it!
+    validations:
+      required: false
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output.
+      render: shell
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Details about your environment
+      description: Please provide the following information about your environment.
+      placeholder: |
+        ## Your Environment
+        - Go Version:
+        - Operating System:
+        - Browser (if applicable):
+        - Relevant env vars
+
+        Tell us what you see!
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 0000000..bd9dfe4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,2 @@
+---
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 0300b49..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for burpference
-title: '[FEATURE] '
-labels: enhancement
-assignees: ''
----
-
-### Problem Description
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-### Proposed Solution
-A clear and concise description of what you want to happen.
-
-### Alternative Solutions
-A clear and concise description of any alternative solutions or features you've considered.
-
-### Use Case
-Describe how this feature would be used and who would use it.
-
-### Additional Context
-Add any other context, screenshots, or mock-ups about the feature request here.
-
-### Implementation Ideas
-If you have any thoughts on how this could be implemented, share them here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 0000000..f2dd5d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,54 @@
+---
+name: "💡 Feature Request"
+description: Create a new ticket for a new feature request
+title: "💡 [REQUEST] - <title>"
+labels: ["question"]
+body:
+  - type: textarea
+    id: implementation_pr
+    attributes:
+      label: "Implementation PR"
+      description: Associated pull request
+      placeholder: "# Pull Request ID"
+    validations:
+      required: false
+  - type: textarea
+    id: reference_issues
+    attributes:
+      label: "Reference Issues"
+      description: Related issues
+      placeholder: "# Issue ID(s)"
+    validations:
+      required: false
+  - type: textarea
+    id: summary
+    attributes:
+      label: "Summary"
+      description: Provide a brief explanation of the feature
+      placeholder: Describe your feature request
+    validations:
+      required: true
+  - type: textarea
+    id: basic_example
+    attributes:
+      label: "Basic Example"
+      description: Provide some basic examples of your feature
+      placeholder: A few specific details about your feature request
+    validations:
+      required: true
+  - type: textarea
+    id: drawbacks
+    attributes:
+      label: "Drawbacks"
+      description: What are the drawbacks/impacts of your feature request?
+      placeholder: Identify the drawbacks and impacts while remaining neutral on your feature request
+    validations:
+      required: true
+  - type: textarea
+    id: unresolved_question
+    attributes:
+      label: "Unresolved questions"
+      description: What questions remain unresolved?
+      placeholder: Identify any unresolved issues
+    validations:
+      required: false
\ No newline at end of file