diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 14c327b1..1e188225 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,101 +1,87 @@
-name: "Bug Report [new]"
+name: "Bug Report [NEW]"
 description: "Report an issue with the software."
-title: "[BUG] "
-labels: ["type:bug", "bug"]
+title: "[Bug]: "
+labels: ["bug"]
 body:
-  - type: markdown
-    content: |
-      Please provide the following information to help us diagnose the problem.
-  
-  - type: input
+  - type: textarea
     id: summary
     attributes:
       label: "Summary"
       description: "Provide a short description of the issue."
       placeholder: "e.g., App crashes when opening a file"
-  
-  - type: dropdown
-    id: os
-    attributes:
-      label: "Operating System"
-      description: "Select your operating system."
-      options:
-        - "Windows"
-        - "Debuntu"
-        - "Kodi specific distros"
-        - "Other Linux"
-        - "Mac"
-        - "Xbox"
-        - "Other"
-  
-  - type: dropdown
-    id: jellyfin_version
-    attributes:
-      label: "Jellyfin Server Version"
-      description: "Select the Jellyfin server version."
-      options:
-        - "10.7"
-        - "10.8"
-        - "10.9"
-        - "10.10"
-        - "Other"
-  
-  - type: dropdown
-    id: kodi_version
-    attributes:
-      label: "Kodi Version"
-      description: "Select the Kodi version."
-      options:
-        - "19"
-        - "20"
-        - "21"
-        - "Other"
-  
-  - type: dropdown
-    id: addon_mode
-    attributes:
-      label: "Addon Mode"
-      description: "Select how you are using the addon."
-      options:
-        - "Addon-mode"
-        - "Direct-path mode ('native')"
-  
+    validations:
+      required: true
+
   - type: textarea
     id: steps_to_reproduce
     attributes:
       label: "Steps to Reproduce"
       description: "Provide detailed steps to reproduce the issue."
-      placeholder: "e.g., 1. Do this. 2. Then do that."
-  
-  - type: file-upload
+      placeholder: |
+        e.g., 
+        1. Open the app.
+        2. Click on the file.
+        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
+    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:
+        - "Addon-mode"
+        - "Direct-path mode ('native')"
+    validations:
+      required: true
+
+  - type: textarea
     id: logs
     attributes:
       label: "Logs"
-      description: "Upload logs to help with debugging."
-      multiple: true
-      filetypes: [".log", ".txt"]
-  
-  - type: file-upload
-    id: screenshots
-    attributes:
-      label: "Screenshots (optional)"
-      description: "Upload screenshots that show the issue."
-      multiple: true
-      filetypes: [".png", ".jpg", ".jpeg", ".gif"]
-      optional: true
-  
-  - type: file-upload
+      description: "Please provide the logs."
+      placeholder: "Paste your logs here..."
+      render: "bash"
+    validations:
+      required: true
+
+  - type: textarea
     id: server_logs
     attributes:
-      label: "Server Logs (optional)"
-      description: "Upload server logs if available."
-      multiple: true
-      filetypes: [".log", ".txt"]
-      optional: true
-  
+      label: "Server Logs"
+      description: "Please provide the server logs."
+      placeholder: "Paste your server logs here..."
+      render: "bash"
+    validations:
+      required: false
+
   - type: textarea
     id: additional_info
     attributes:
-      label: "Additional Information (optional)"
+      label: "Additional Information"
       description: "Provide any other relevant information."
-      optional: true
+      placeholder: "e.g., Additional context or setup details"
+    validations:
+      required: false
\ No newline at end of file