diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index cfffc40be..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Create a bug report so we can fix it
-
----
-
-*Please fill in this template rather than deleting it*
-
-**Describe the bug, provide any errors**
-A clear and concise description of what the bug is. If present, can you paste the error to https://paste.gg/?
-
-**How can we reproduce it?**
-Steps to reproduce the behavior:
-1. Login on 1.12'
-2. Click on '....'
-3. The '....' is displayed wrong
-
-**Expected behaviour**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**ViaVersion Dump**
-- Type /viaversion dump, and put the link here.
-
-**Additional server info**
-Do you use a proxy (eg. BungeeCord)? What software do you use and what plugins?
-
-**Checklist**
-- [ ] I have included a Viaversion dump
-- [ ] If applicable, I have included a paste (not a screenshot) of the error
-- [ ] I have tried a build from https://ci.viaversion.com/ and the issue still persists
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..d115cce28
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,89 @@
+name: Bug report
+description: Report a bug or console error
+
+body:
+  - type: markdown
+    attributes:
+      value: Before reporting a bug, please see if using master/dev builds from https://ci.viaversion.com/ fixes your issue.
+
+  - type: input
+    attributes:
+      label: "'/viaVersion dump' output"
+      description: Run `/viaversion dump` in the console or in the chat, then copy and paste the given link here.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Error
+      description: |
+        If you encounter warnings/errors in your console, **paste them under https://paste.gg/** and put the paste link here.
+        If the error is small/less than 10 lines, you may put it directly into this field.
+      value: |
+        ```
+        Put the paste.gg link or text here.
+        ```
+      placeholder: Please do not remove the grave accents; simply replace the line of text in the middle.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: |
+        A clear and concise description of what the bug is.
+      placeholder: |
+        Example: "Placing signs on 1.13.2 causes text to disappear."
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        A clear and concise description of how we can reproduce the issue.
+      placeholder: |
+        Example:
+        1. Login with a 1.13.2 client
+        2. Place a sign
+        3. The sign text is displayed wrong
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: |
+        A clear and concise description of what you expected to happen.
+      placeholder: |
+        Example: "Placed sign text should not disappear."
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional server information
+      description: |
+        Do you use a proxy (eg. BungeeCord)? What software do you use and what plugins?
+      placeholder: |
+        Example: "I also use BungeeCord with the following plugins: x, y, z"
+    validations:
+      required: false
+
+  - type: checkboxes
+    attributes:
+      label: Checklist
+      description: Make sure you have followed each of the steps outlined here.
+      options:
+        - label: Via plugins are only running on *either* my backend servers (e.g. Paper) *or* the proxy (e.g. BungeeCord), not on both.
+          required: true
+        - label: I have included a ViaVersion dump.
+          required: true
+        - label: If applicable, I have included a paste (not a screenshot!) of the error.
+          required: true
+        - label: I have tried a build from https://ci.viaversion.com/ and the issue still persists.
+          required: true
+
+  - type: markdown
+    attributes:
+      value: If needed, add **screenshots to help explain your problem** in the comment field below.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 3ba13e0ce..2f4ad6c40 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: PaperMC Discord
+    url: https://discord.gg/viaversion
+    about: For smaller issues or questions, you can also join our Discord server.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 8bbc2c4fd..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for ViaVersion
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Which versions is this for?**
-Does the feature apply to any specific versions? If so put them here.