diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 55f04441..00000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: "Bug Report \U0001F41B"
-about: Submit a bug report for an issue you've come across
-title: "[BUG]"
-labels: "\U0001F41B Bug"
-assignees: Lissy93
-
----
-
-Thank you for taking the time to raise a bug, and sorry that you've had issues with Dashy  😟
-
-**If applicable to your issue, please include:**
-- A description of the bug, including actual behavior and if applicable, expected behavior
-- Steps to reproduce
-- Info about your system (device, OS, browser and browser version)
-- Any console errors? If the issue happens at runtime, open up the dev tools [F12], and go to the Console tab. If the output is very long, please use [0bin](https://0bin.net/)
-- Any screenshots, if it is a frontend issue
-
-**Before submitting, please ensure that:**
-- [ ] This issue has not already been raised
-- [ ] You are using the latest version of Dashy
-- [ ] You've included the relevant information above
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 00000000..48bf3627
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,60 @@
+name: Bug Report 🐛
+description: Report something that's not working the way it's (probably) intended to
+title: '[BUG] <title>'
+labels: '\U0001F41B Bug'
+body:
+  - type: dropdown
+    id: environment
+    attributes:
+      label: Environment
+      description: Where are you running Dashy?
+      options:
+        - Self-Hosted (Docker)
+        - Self-Hosted (Bare Metal)
+        - Cloud Service (Static)
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of Dashy are you running?
+      placeholder: 1.6.9 ← should look like this (check config menu)
+    validations:
+      required: false
+  - type: textarea
+    id: repro
+    attributes:
+      label: Describe the problem
+      description: Please describe exactly what is not working, include the steps to reproduce, actual result and expected result
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Additional info
+      description: Logs? Screenshots? Yes, please.
+    validations:
+      required: false
+  - type: checkboxes
+    id: idiot-check
+    attributes:
+      label: Please tick the boxes
+      description: Before submitting, please ensure that
+      options:
+        - label: You are using the latest, or recent version of Dashy
+          required: true
+        - label: You've checked that this [issue hasn't already been raised](https://github.com/Lissy93/dashy/issues?q=is%3Aissue)
+          required: true
+        - label: You've checked the [docs](https://github.com/Lissy93/dashy/tree/master/docs#readme) and [troubleshooting](https://github.com/Lissy93/dashy/blob/master/docs/troubleshooting.md#troubleshooting) guide
+          required: true
+        - label: You agree to the [code of conduct](https://github.com/Lissy93/dashy/blob/master/.github/CODE_OF_CONDUCT.md#contributor-covenant-code-of-conduct)
+          required: true
+  - type: markdown
+    attributes:
+      value: |-
+        ## Thanks 🙏
+        Sorry you are having issues with Dashy, and thank you for raising this ticket - in doing so you are helping to make the app better for everyone 💪
+        You should expect a reply within the next 48 hours :)
+    validations:
+      required: false
\ No newline at end of file