diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index e994df75e..f356a04e7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,10 +1,10 @@
-name: Issue report
+name: Issue Report
 description: File an issue report
 body:
 - 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.
+    description: Please search to see if an issue already exists for the bug you encountered. If you're unsure whether or not a previous issue matches your own, file a new issue.
     options:
     - label: I have searched the existing issues
       required: true
@@ -18,13 +18,13 @@ body:
 - type: textarea
   attributes:
     label: Current Behavior
-    description: A concise description of the issue you're experiencing.
+    description: A concise description of the issue you're experiencing. If this is a regression, please try to provide the last gamescope version where the issue did not occur for you.
   validations:
     required: false
 - type: textarea
   attributes:
-    label: Steps To Reproduce
-    description: Steps to reproduce the issue.
+    label: Steps to reproduce
+    description: Steps to reproduce the issue. The clearer the steps, the easier it will be for a developer to try and debug.
     placeholder: |
       1. Launch Dota 2 from Steam with the gamescope launch command `gamescope -f -r 120 -- %command%`...
       2. Enter a bot match
@@ -33,14 +33,17 @@ body:
     required: false
 - type: textarea
   attributes:
-    label: Hardware information
+    label: Hardware Information
     description: |
       examples:
+        - **Device type**: Steam Deck, Desktop, Laptop, etc.
         - **Distro**: SteamOS 3.6.15 (`cat /etc/os-release`)
         - **CPU**: 32-core AMD Ryzen Threadripper 7970X (`inxi` or `cat /proc/cpuinfo`)
-        - **GPU**: Advanced Micro Devices [AMD/ATI] Navi 31 [Radeon RX 7900 XT/7900 XTX/7900M] (`lspci -nn | grep VGA` or `lshw -C display -numeric` or `vulkaninfo --summary | grep deviceName`
-        - **Driver Version**: Mesa 24.2.3 or NVIDIA 560.35.03 (`vulkaninfo --summary | grep driverInfo` or `nvidia-smi`)
+        - **GPU**: Advanced Micro Devices [AMD/ATI] Navi 31 [Radeon RX 7900 XT/7900 XTX/7900M] (`lspci -nn | grep VGA` or `lshw -C display -numeric` or `vulkaninfo --summary | grep deviceName`)
+        - **Driver Version**: Mesa 24.2.3 or NVIDIA 565.77 (`vulkaninfo --summary | grep driverInfo` or `nvidia-smi`)
+          **NOTE: If you're using an NVIDIA driver, please run `nvidia-bug-report.sh` and attach your `nvidia-bug-report.log.gz` in the bottom section of the form.**
     value: |
+        - Device type: 
         - Distro: 
         - CPU: 
         - GPU: 
@@ -50,12 +53,12 @@ body:
     required: false
 - type: textarea
   attributes:
-    label: Software information
+    label: Software Information
     description: |
       examples:
-        - **Desktop environment**: KDE 6.1.5
-        - **Session type**: wayland (`echo $XDG_SESSION_TYPE`)
-        - **Gamescope version**: gamescope version 3.15.9-8-gddf0d76 (gcc 14.2.1) (find this with `gamescope --version`)
+        - **Desktop environment**: KDE 6.2.2
+        - **Session type**: Wayland (`echo $XDG_SESSION_TYPE`)
+        - **Gamescope version**: gamescope version 3.15.15 (gcc 14.2.1) (find this with `gamescope --version`)
         - **Gamescope launch command(s)**: `gamescope -f -h 2160 -w 7680 -r 120 -- %command%`
     value: |
         - Desktop environment: 
@@ -81,8 +84,9 @@ body:
   attributes:
     label: Logging, screenshots, or anything else
     description: |
-      Please include any relevant logging or screenshots that will give us more context about the issue you are reporting.
-
+      Please include any relevant logging, screenshots, or an `nvidia-bug-report.tar.gz` if applicable in this section.
+      System reports generated by Steam (Help -> System Report on the desktop client or Settings -> System -> Create Report -> Save to Desktop in gamescope-session) can also be helpful.
+      
       Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
   validations:
     required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 7d1a9f05f..4924db4a7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,4 +1,4 @@
-name: Feature request
+name: Feature Request
 description: Share ideas for new features
 body:
 - type: textarea