diff --git a/.github/ISSUE_TEMPLATE/1-Bug_report.md b/.github/ISSUE_TEMPLATE/1-Bug_report.md
deleted file mode 100644
index 8f2b5724..00000000
--- a/.github/ISSUE_TEMPLATE/1-Bug_report.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: Bug report
-about: You're having technical issues. 🐞
-labels: 'bug'
----
-
-## Expected Behavior
-
-<!--- What should have happened? -->
-
-## Current Behavior
-
-<!--- What went wrong? -->
-<!-- Add screenshots to help explain your problem -->
-<!-- (Open the browser dev tools in the menu or using CTRL + SHIFT + I) -->
-
-## Steps to Reproduce
-
-<!-- Add relevant code and/or a live example -->
-<!-- Add stack traces -->
-
-1.
-
-2.
-
-3.
-
-4.
-
-## Possible Solution (Not obligatory)
-
-<!--- Suggest a reason for the bug or how to fix it. -->
-
-## Context
-
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-
-## Your Environment
-
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-
--   Application version (e.g. v0.1.0) :
--   Operating System and version (e.g. Windows 10) :
--   Server and version (e.g. Navidrome v0.48.0) :
--   Node version (if developing locally) :
diff --git a/.github/ISSUE_TEMPLATE/2-Question.md b/.github/ISSUE_TEMPLATE/2-Question.md
deleted file mode 100644
index aec9e1fc..00000000
--- a/.github/ISSUE_TEMPLATE/2-Question.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Question
-about: Ask a question.❓
-labels: 'question'
----
-
-<!-- Question issues will be closed. -->
-<!-- Ask questions in the discussions tab: Please use discussions https://github.com/jeffvli/feishin/discussions -->
-<!-- Or join the Discord/Matrix servers: https://discord.gg/FVKpcMDy5f https://matrix.to/#/#sonixd:matrix.org -->
diff --git a/.github/ISSUE_TEMPLATE/3-Feature_request.md b/.github/ISSUE_TEMPLATE/3-Feature_request.md
deleted file mode 100644
index 0e02f8c1..00000000
--- a/.github/ISSUE_TEMPLATE/3-Feature_request.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Feature request
-about: Request a feature to be added to Feishin 🎉
-labels: 'enhancement'
----
-
-## What do you want to be added?
-
-## Additional context
-
-<!-- Is this a server-specific feature? (e.g. Jellyfin only). -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..4a452bb4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,63 @@
+name: Bug report
+description: You're having technical issues. 🐞
+labels: ['bug']
+body:
+    - type: textarea
+      attributes:
+          label: Expected Behavior
+          description: What should have happened?
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Current Behavior
+          description: What went wrong? Add screenshots to help explain your problem. (Open the browser dev tools in the menu or using CTRL + SHIFT + I)
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Steps to Reproduce
+          placeholder: |
+              <!-- Add relevant code and/or a live example -->
+              <!-- Add stack traces -->
+              1.
+              2.
+              3.
+              4.
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Possible Solution
+          description: Suggest a reason for the bug or how to fix it.
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Context
+          description: How has this issue affected you? What are you trying to accomplish?
+      validations:
+          required: false
+    - type: input
+      attributes:
+          label: Application version
+          placeholder: (e.g. v0.1.0)
+      validations:
+          required: true
+    - type: input
+      attributes:
+          label: Operating System and version
+          placeholder: (e.g. Windows 11 desktop, Webapp in Firefox)
+      validations:
+          required: true
+    - type: input
+      attributes:
+          label: Server and Version
+          placeholder: (e.g. Navidrome v0.48.0)
+      validations:
+          required: true
+    - type: input
+      attributes:
+          label: Node Version (if developing locally)
+      validations:
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..cf03a007
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+    - name: Question
+      url: https://github.com/jeffvli/feishin/discussions
+      about: Please ask and answer questions here.
+    - name: Report a security vulnerability
+      url: https://github.com/jeffvli/feishin/security/advisories/new
+      about: Privately report a security vulnerability.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..2043e1af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,22 @@
+name: Feature request
+description: Request a feature to be added to Feishin 🎉
+labels: ['enhancement']
+body:
+    - type: textarea
+      attributes:
+          label: What do you want to be added?
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Additional context
+      validations:
+          required: false
+    - type: checkboxes
+      attributes:
+          label: Is this a server-specific feature? (e.g. Jellyfin only)
+          options:
+              - label: 'Yes'
+                required: false
+      validations:
+          required: false