diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 0a11d53e9..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: 'Type: bug'
-assignees: ''
-
----
-
-#### Before reporting an issue make sure you are running the latest build of the plugin and checked for duplicate issues!
-
-### What behaviour is observed:
-What happened?
-
-### What behaviour is expected:
-What did you expect?
-
-### Steps/models to reproduce:
-The actions that cause the issue
-
-### Plugin list:
-This can be found by running `/pl`
-
-### Environment description
-Standalone server/Bungeecord network, SQLite/MySql, ...
-
-### AuthMe build number:
-This can be found by running `/authme version`
-
-### Error Log:
-Pastebin/Hastebin/Gist link of the error log or stacktrace (if any)
-
-### Configuration:
-Pastebin/Hastebin/Gist link of your config.yml file (remember to delete any sensitive data)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..18464fe55
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,83 @@
+name: Bug report
+description: Create a report to help us improve
+labels: 'Type: bug'
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before reporting an issue make sure you are running the latest build of the plugin and checked for duplicate issues!
+
+  - type: textarea
+    attributes:
+      label: What behaviour is observed?
+      description: A clear and concise description of what the behavior is.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behaviour
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce this behaviour
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Plugin list
+      description: This can be found by running `/pl`
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Server Implementation
+      description: Which server implementation are you using?
+      multiple: false
+      options:
+        - Standalone server (no proxy)
+        - BungeeCord
+    validations:
+      required: true
+
+  - type: dropdown
+    attributes:
+      label: Database Implementation
+      description: Which database implementation are you using?
+      multiple: false
+      options:
+        - SQLite
+        - MySQL
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: AuthMe Version
+      description: What version of AuthMe are you running? (`/authme version`)
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Error log (if applicable)
+      description: If you are reporting a console error, upload any relevant log excerpts to either https://paste.gg/ or https://gist.github.com, save and the paste the link in this box.
+
+  - type: input
+    attributes:
+      label: Configuration
+      description: Link of your config.yml file (remember to delete any sensitive data), upload any relevant log excerpts to either https://paste.gg/ or https://gist.github.com, save and the paste the link in this box.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..ac2e8b47d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 6749d7fe5..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for AuthMe
-title: ''
-labels: 'Type: enhancement'
-assignees: ''
-
----
-
-**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.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..cbb688c09
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,28 @@
+name: Feature request
+description: Suggest an idea for AuthMe
+labels: 'Type: enhancement'
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request for AuthMe! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
+
+  - type: textarea
+    attributes:
+      label: What feature do you want to see added?
+      description: A clear and concise description of your feature request.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Are there any alternatives?
+      description: List any alternatives you might have tried
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: You can provide additional context below.