diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 85d64312..abfc112e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -8,47 +8,49 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report!
-  - type: textarea
-    id: description
+  - type: checkboxes
     attributes:
-      label: Describe the Bug
-      description: A clear and concise description of the bug you encountered. Also tell us, what did you expect to happen?
-      placeholder: Tell us what you see!
-      value: "A bug happened!"
+      label: Preflight Checklist
+      description: Please ensure you've completed all of the following.
+      options:
+        - label: I have read the [Support Disclaimer](https://docs.cider.sh/support/disclaimer) for this project.
+          required: true
+        - label: I agree to follow the [Code of Conduct](https://github.com/ciderapp/Cider/blob/main/CODE_OF_CONDUCT.md) that this project adheres to.
+          required: true
+        - label: I have searched the [issue tracker](https://www.github.com/ciderapp/Cider/issues) for a bug report that matches the one I want to file, without success.
+          required: true
+  - type: input
+    attributes:
+      label: Cider Version
+      description: |
+        What version of Cider are you using?
+        
+        Note: Please only report issues for [currently supported versions of Cider](hhttps://cider.gitbook.io/welcome-to-gitbook/support/version-information). You can find your version on the About Page.
+      placeholder: 1.6.0
     validations:
       required: true
-  - type: textarea
-    id: replication
+  - type: dropdown
     attributes:
-      label: Steps to Reproduce
-      description: How did you produce this bug, tell us how you did it so we can do it ourselves.
-      placeholder: Tell us how you did it
-      value: "1. Clicked on..."
+      label: What operating system are you using?
+      options:
+        - Windows
+        - macOS
+        - Ubuntu
+        - Other Linux
+        - Other (specify below)
     validations:
-      required: true  
-  - type: textarea
-    id: environment
+      required: true
+  - type: input
     attributes:
-      label: Environment Information
-      description: |
-        Examples:
-          - **OS**: Ubuntu 20.04
-          - **Desktop Environment (if applicable)**: i3wm
-          - **App Version**: 1.5.5-beta.22
-          - **Commit ID (if available)**: c9d43be
-        
-        *To find the app version, Cider Menu -> About*
-      value: |
-        - OS:
-        - Desktop Environment: 
-        - App Version:
-        - Commit ID:
+      label: Operating System Version
+      description: What operating system version are you using? On Windows, click Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, use lsb_release or uname -a.
+      placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04"
     validations:
       required: true
   - type: dropdown
     id: download
     attributes:
-      label: How did you download the software?
+      label: Where did you download Cider from?
       options:
         - Microsoft Store
         - GitHub
@@ -59,6 +61,22 @@ body:
         - AUR
     validations:
       required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the Bug
+      description: A clear and concise description of the bug you encountered. Tell us what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: replication
+    attributes:
+      label: Steps to Reproduce
+      description: How did you produce this bug, tell us how you did it so we can do it ourselves.
+      placeholder: 1. Clicked on...
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Anything else?
@@ -66,19 +84,3 @@ body:
         Links? References? Anything that will give us more context about the issue you are encountering!
 
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/ciderapp/Cider/blob/main/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow this Cider's [Code of Conduct](https://github.com/ciderapp/Cider/blob/main/CODE_OF_CONDUCT.md)
-          required: true
-  - type: checkboxes
-    id: disclaimer
-    attributes:
-      label: Disclaimer
-      description: By submitting this issue, you are aware of our [Support Disclaimer](https://docs.cider.sh/support/disclaimer) and acknowledge that your issue may be immidiately closed if it is invalid.
-      options:
-        - label: I acknowledge the [Support Disclaimer](https://docs.cider.sh/support/disclaimer)
-          required: true