diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index a670508..0000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Bug Report
-about: Report a bug to help improve Akari
-title: "[Bug]"
-labels: bug
-assignees: ''
-
----
-
-### Description
-Provide a clear and concise description of the bug.
-
-### Steps to Reproduce
-List the steps to reproduce the issue:
-1. Go to '...'
-2. Click on '...'
-3. Observe the issue.
-
-### Expected Behavior
-What did you expect to happen?
-
-### Screenshots/Video
-Include images or videos (with text explanation) to help reproduce the issue, if possible.
-
-### Environment
-- **Browser**: [e.g., Chrome, Firefox]
-- **Akari Version**: [Find it on the settings page]
-- **Installed as PWA?**: [Yes/No]
-
-### Severity
-Select the severity level:
-- [ ] Breaking (causes the app or feature to become unusable)
-- [ ] Non-breaking (affects functionality but has a workaround)
-- [ ] Cosmetic (visual or layout issue)
-
-### Additional Context
-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..dc6f03f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,93 @@
+name: Bug Report
+description: Report a bug to help improve Akari
+title: "[Bug]: "
+labels: ["bug"]
+assignees: []
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Provide a clear and concise description of the bug.
+      placeholder: Describe the bug here...
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        **Steps to Reproduce**
+        Please list the steps to reproduce the issue:
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to Reproduce
+      description: List the steps to reproduce the issue.
+      placeholder: "1. Go to '...'\n2. Click on '...'\n3. Observe the issue."
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: Expected Behavior
+      description: What did you expect to happen?
+      placeholder: Describe the expected behavior here...
+    validations:
+      required: true
+
+  - type: textarea
+    id: media
+    attributes:
+      label: Screenshots/Video
+      description: Include images or videos to help reproduce the issue, if possible.
+      placeholder: Provide links to screenshots or videos here...
+
+  - type: input
+    id: browser
+    attributes:
+      label: Browser
+      description: e.g., Chrome, Firefox
+      placeholder: Specify the browser here...
+    validations:
+      required: true
+
+  - type: input
+    id: akari_version
+    attributes:
+      label: Akari Version
+      description: Find it on the settings page.
+      placeholder: Specify the Akari version here...
+    validations:
+      required: true
+
+  - type: dropdown
+    id: pwa
+    attributes:
+      label: Installed as PWA?
+      description: Was the app installed as a Progressive Web App?
+      options:
+        - Yes
+        - No
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: severity
+    attributes:
+      label: Severity
+      description: Select the severity level:
+      options:
+        - label: Breaking (causes the app or feature to become unusable)
+          required: true
+        - label: Non-breaking (affects functionality but has a workaround)
+        - label: Cosmetic (visual or layout issue)
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here.
+      placeholder: Provide additional context here...