diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index b0c5911bd..b5b6d8fa8 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,6 +1,53 @@
 name: Bug Report
 description: Something is not working (video, audio, gamepad, crash, etc...)
 body:
+  - type: dropdown
+    attributes:
+      label: Device Type
+      description: What kind of device are you using?
+      options:
+        - webOS TV
+        - Raspberry Pi
+        - Steam Link
+        - Other (Desktop Linux, macOS, etc...)
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Device Model
+      description: What is the model of your device?
+      placeholder: "Example: LG C9"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Device OS
+      description: What is the OS version of your device?
+      placeholder: "Example: webOS 4.5.3"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Moonlight Version
+      description: What is the version of Moonlight you are using?
+      placeholder: "Example: 1.6.0"
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Host OS
+      description: What is the OS of your computer?
+      options:
+        - Windows
+        - Linux
+        - macOS
+  - type: dropdown
+    attributes:
+      label: Host Software
+      description: What streaming software are you using?
+      options:
+        - Sunshine
+        - GeForce Experience
   - type: textarea
     attributes:
       label: Bug Description
diff --git a/.github/ISSUE_TEMPLATE/compatibility_report.md b/.github/ISSUE_TEMPLATE/compatibility_report.md
deleted file mode 100644
index 36fb806f1..000000000
--- a/.github/ISSUE_TEMPLATE/compatibility_report.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Device Compatibility Report
-about: Do you encounter any problem on your device?
-title: "[COMPAT]"
-labels: compatibility
-assignees: ''
-
----
-
-<!-- Since device support range becomes wider, please submit this issue ONLY when you got problems -->
-
-## Basic information
-<!-- Please fill info into following spaces -->
- - Device model: (       ) <!-- e.g. 55SM8100PJB -->
- - Firmware version: (       ) <!-- Can be found in webOS Settings, e.g. 05.00.01 -->
- - webOS version: (       ) <!-- Can be found in Moonlight Settings - About, e.g. 4.9.0-53802 -->
- - Moonlight version: (       ) <!-- Can be found in Moonlight Settings - About -->
- - Is audio working: (       ) <!-- e.g. Yes/No -->
- - Is video working: (       ) <!-- e.g. 4K60fps -->
- - Is input working: (       ) <!-- e.g. Gamepad, Remote -->
-
-## Description
-<!-- Please describe the issue you have been encountered -->