diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dfe94f0f0..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: "\U0001F41B Bug report"
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Logs (Logs directory where Ombi is located)**
-If applicable, a snippet of the logs that seems relevant to the bug if present.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
-
-**Ombi Version (please complete the following information):**
- - Version [e.g. 4.0.958]
-- Media Server [e.g. Plex]
-- Database Type: SQLite (Please change if using MySQL)
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..95612ce32
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,50 @@
+name: "\U0001F41B Bug report"
+description: 'Report a reproducible bug in Ombi'
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
+  - type: markdown
+    attributes:
+      value: |
+        If you leave out sections there is a high likelihood your issue will be closed.
+        If you have a question or you think your issue might be caused by your application code, you can get help from the community on [Discord](https://discord.gg/Sa7wNWb).
+  - type: textarea
+    attributes:
+      label: Summary
+      description: |
+        Clearly describe what the expected behavior is vs. what is actually happening. Please include any reproduction steps that is required to reproduce this issue.
+        If your summary is simply, for example: "I cannot setup Plex", then you will need to [continue debugging on your own](https://docs.ombi.app/) to more precisely define your issue before proceeding.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Ombi Version
+      description: What version of ombi are you running?
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: What platform(s) does this occur on?
+      multiple: true
+      options:
+        - Docker
+        - Windows
+        - Linux
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: What database are you using?
+      options:
+        - SQLite (Default)
+        - MySQL
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a9da96171..a90a3250f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,8 +3,8 @@ contact_links:
   - name: Docs
     url: https://docs.ombi.app/
     about: The Ombi documentation should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions
-  - name: Reddit support
-    url: https://www.reddit.com/r/Ombi
+  - name: Discord support
+    url: https://discord.gg/Sa7wNWb
     about: Ask questions about Ombi
   - name: Feature suggestions
     url: https://ombifeatures.featureupvote.com