diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..b301e02f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,87 @@
+name: "Bug Report"
+description: "Report an issue with the software."
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: textarea
+    id: summary
+    attributes:
+      label: "Summary"
+      description: "Provide a short description of the issue."
+      placeholder: "When playing a movie via the «Resume from» context menu, I get the error message «xyz»"
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps_to_reproduce
+    attributes:
+      label: "Steps to Reproduce"
+      description: "Provide detailed steps to reproduce the issue."
+      placeholder: |
+        1. Open the app.
+        2. Click on a movie.
+        3. The app crashes.
+    validations:
+      required: true
+
+  - type: input
+    id: os
+    attributes:
+      label: "Operating System"
+      description: "Specify the operating system you are using."
+      placeholder: "e.g., Ubuntu 24.04"
+      
+  - type: input
+    id: jellyfin_server_version
+    attributes:
+      label: "Jellyfin Server Version"
+      description: "Specify the version of the Jellyfin server you're using. If you're using an unstable build, please include the commit hash."
+      placeholder: "e.g., 10.9 or 10.10"
+      
+  - type: input
+    id: kodi_version
+    attributes:
+      label: "Kodi Version"
+      description: "Specify the Kodi version you're using."
+      placeholder: "e.g., 20.0"
+      
+  - type: dropdown
+    id: addon_mode
+    attributes:
+      label: "Addon Mode"
+      description: "Select how you're using the addon."
+      options:
+        - "Please Select..."
+        - "Addon-mode"
+        - "Direct-path mode ('native')"
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: "Logs"
+      description: "Please provide the logs."
+      placeholder: "Paste your Kodi logs here..."
+      render: "python"
+    validations:
+      required: true
+
+  - type: textarea
+    id: server_logs
+    attributes:
+      label: "Server Logs"
+      description: "Please provide server logs (if relevant)."
+      placeholder: "Paste your server logs here..."
+      render: "csharp"
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional_info
+    attributes:
+      label: "Additional Information"
+      description: "Provide any other relevant information."
+      placeholder: "Additional context, setup details or screenshots"
+    validations:
+      required: false
diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
similarity index 86%
rename from .github/issue_template.md
rename to .github/ISSUE_TEMPLATE/issue_template.md
index 5cc69fb3..2ddd9fc2 100644
--- a/.github/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -1,3 +1,12 @@
+---
+name: Bug report [old template]
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
 
@@ -18,6 +27,7 @@
 <!-- If applicable, add screenshots to help explain your problem. -->
 
 **System (please complete the following information):**
+
 - OS: [e.g. Android, Debian, Windows]
 - Jellyfin Version: [e.g. 10.0.1]
 - Kodi Version: [e.g. 18.3]