diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index bd7b69eb31f..f03374555f9 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -7,33 +7,32 @@ body:
       value: >
         **THIS IS NOT THE PLACE TO ASK FOR SUPPORT!**
         Please use our [Support Center](https://app.lizardbyte.dev/support) for support issues.
-        Non actionable bug reports will be locked and closed!
+        Non actionable bug reports will be LOCKED and CLOSED!
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this?
       description: Please search to see if an issue already exists for the bug you encountered.
       options:
         - label: I have searched the existing issues
-          required: true
   - type: checkboxes
     attributes:
       label: Is your issue described in the documentation?
       description: Please read our [documentation](https://docs.lizardbyte.dev/projects/sunshine)
       options:
         - label: I have read the documentation
-          required: true
-  - type: checkboxes
+  - type: dropdown
     attributes:
       label: Is your issue present in the latest beta/pre-release?
-      description: Please test the latest [pre-release](https://github.com/LizardByte/Sunshine/releases)
+      description: Please test the latest [pre-release](https://github.com/LizardByte/Sunshine/releases).
       options:
-        - label: This issue is present in the latest pre-release
-          required: true
+        - "I didn't read the issue template"
+        - "I'm too lazy to test"
+        - "This issue is present in the latest pre-release"
   - type: textarea
     id: description
     attributes:
       label: Describe the Bug
-      description: A clear and concise description of the bug.
+      description: A clear and concise description of the bug, list the reproduction steps.
     validations:
       required: true
   - type: textarea
@@ -81,7 +80,9 @@ body:
     id: version
     attributes:
       label: Sunshine commit or version
-      placeholder: eg. 0.18.0
+      description: |
+        Use `sunshine --verison` to get the version, or get the version from web UI.
+        Please don't just copy the latest commit from our repo, if that's not the commit you're actually using.
     validations:
       required: true
   - type: dropdown
@@ -94,12 +95,13 @@ body:
         - Linux - AUR (Third Party)
         - Linux - deb
         - Linux - Docker
+        - Linux - flathub (Third Party)
         - Linux - flatpak
         - Linux - Homebrew
         - Linux - nixpkgs (Third Party)
-        - Linux - PKGBUILD
         - Linux - pkg.tar.zst
         - Linux - rpm
+        - Linux - solus (Third Party)
         - macOS - Homebrew
         - macOS - Portfile
         - Windows - Chocolatey (Third Party)
@@ -131,7 +133,6 @@ body:
     attributes:
       label: GPU Model
       description: The model of the installed graphics card.
-      placeholder: e.g. GeForce RTX 2080 SUPER
     validations:
       required: true
   - type: input
@@ -139,15 +140,21 @@ body:
     attributes:
       label: GPU Driver/Mesa Version
       description: The driver/mesa version of the installed graphics card.
-      placeholder: e.g. 497.29
     validations:
       required: true
-  - type: input
+  - type: dropdown
     id: capture_method
     attributes:
-      label: Capture Method (Linux Only)
-      description: If on Linux, the capture method being used.
-      placeholder: e.g. PipeWire/KVM/X11/KMS
+      label: Capture Method
+      description: The capture method being used.
+      options:
+        - AVCaptureScreen (macOS)
+        - KMX (Linux)
+        - NvFBC (Linux)
+        - wlroots (Linux)
+        - X11 (Linux)
+        - Desktop Duplication API (Windows)
+        - Windows.Graphics.Capture (Windows)
     validations:
       required: false
   - type: textarea