diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c45bc6bf..965e9947 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -36,16 +36,6 @@ body:
   validations:
     required: true
 
-- type: input
-  id: suwayomi-webui-version
-  attributes:
-    label: Suwayomi-WebUI version
-    description: You can find your Suwayomi-WebUI version in **More → About**.
-    placeholder: |
-      Example: "r1689 STABLE | r2401 PREVIEW"
-  validations:
-    required: true
-
 - type: input
   id: suwayomi-server-version
   attributes:
@@ -56,6 +46,46 @@ body:
   validations:
     required: true
 
+- type: input
+  id: server-os
+  attributes:
+    label: Server operating system
+    description: The operating system on which Suwayomi-Server is running on
+    placeholder: |
+      Example: "Windows 11 Pro 24H2 | Ubuntu 24.04.2 LTS"
+  validations:
+    required: true
+
+- type: input
+  id: server-desktop-environment
+  attributes:
+    label: Server Desktop Environment
+    description:
+    placeholder: |
+      Example: "Gnome 40"
+  validations:
+    required: false
+
+- type: input
+  id: server-jvm-version
+  attributes:
+    label: Server JVM version
+    description: The java version used to run Suwayomi-Server
+    placeholder: |
+      Example: "openjdk 21.0.5 2024-10-15 LTS"
+  validations:
+    required: true
+
+- type: input
+  id: suwayomi-webui-version
+  attributes:
+    label: Suwayomi-WebUI version
+    description: You can find your Suwayomi-WebUI version in **More → About**.
+    placeholder: |
+      Example: "r1689 STABLE | r2401 PREVIEW"
+  validations:
+    required: true
+
 - type: input
   id: client-browser
   attributes:
@@ -76,26 +106,6 @@ body:
   validations:
     required: true
 
-- type: input
-  id: server-os
-  attributes:
-    label: Server operating system
-    description: The operating system on which Suwayomi-Server is running on
-    placeholder: |
-      Example: "Windows 11 Pro 24H2 | Ubuntu 24.04.2 LTS"
-  validations:
-    required: true
-
-- type: input
-  id: server-jvm-version
-  attributes:
-    label: Server JVM version
-    description: The java version used to run Suwayomi-Server
-    placeholder: |
-      Example: "openjdk 21.0.5 2024-10-15 LTS"
-  validations:
-    required: true
-
 - type: textarea
   id: other-details
   attributes:
@@ -125,4 +135,4 @@ body:
     - label: I have filled out all of the requested information in this form, including specific version numbers.
       required: true
     - label: I understand that **Suwayomi does not have or fix any extensions**, and I **will not receive help** for any issues related to sources or extensions.
-      required: true
\ No newline at end of file
+      required: true