diff --git a/.github/ISSUE_TEMPLATE/02-new-feature.yml b/.github/DISCUSSION_TEMPLATE/ideas.yml
similarity index 75%
rename from .github/ISSUE_TEMPLATE/02-new-feature.yml
rename to .github/DISCUSSION_TEMPLATE/ideas.yml
index 500beea4..5d1b4346 100644
--- a/.github/ISSUE_TEMPLATE/02-new-feature.yml
+++ b/.github/DISCUSSION_TEMPLATE/ideas.yml
@@ -1,6 +1,4 @@
-name: "Feature Request"
-description: Request a new feature
-title: "[FEA] - <title>"
+title: "<title>"
 labels: [
   "enhancement"
 ]
diff --git a/.github/ISSUE_TEMPLATE/00-bug.yml b/.github/ISSUE_TEMPLATE/00-bug.yml
index f67a7db7..2f4244a0 100644
--- a/.github/ISSUE_TEMPLATE/00-bug.yml
+++ b/.github/ISSUE_TEMPLATE/00-bug.yml
@@ -1,9 +1,10 @@
 name: "Bug Report"
 description: Report a bug
-title: "[BUG] - <title>"
+title: "<title>"
 labels: [
   "bug"
 ]
+type: "Bug"
 body:
   - type: textarea
     id: description
@@ -28,7 +29,7 @@ body:
     attributes:
       label: "App Version"
       description: What version of the app?
-      placeholder: "v0.3.0"
+      placeholder: "v0.5.1"
     validations:
       required: true
   - type: input
@@ -36,7 +37,7 @@ body:
     attributes:
       label: "Server Version"
       description: What version of the server?
-      placeholder: "10.11.3"
+      placeholder: "10.11.6"
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/01-playback.yml b/.github/ISSUE_TEMPLATE/01-playback.yml
index 2dc73ff6..978c1eba 100644
--- a/.github/ISSUE_TEMPLATE/01-playback.yml
+++ b/.github/ISSUE_TEMPLATE/01-playback.yml
@@ -1,9 +1,10 @@
 name: "Playback Problem"
 description: Report an issue with playback
-title: "[BUG] - <title>"
+title: "<title>"
 labels: [
   "bug", "playback"
 ]
+type: "Bug"
 body:
   - type: textarea
     id: description
@@ -17,6 +18,7 @@ body:
     attributes:
       label: "Media info"
       description: Please enter details about what media you are trying to play (video or audio codecs, container, etc)
+      placeholder: Use mediainfo or "Send media info to server" in the app to gather this
     validations:
       required: true
   - type: dropdown
@@ -35,7 +37,7 @@ body:
     attributes:
       label: "App Version"
       description: What version of the app?
-      placeholder: "v0.3.0"
+      placeholder: "v0.5.1"
     validations:
       required: true
   - type: input
@@ -43,7 +45,7 @@ body:
     attributes:
       label: "Server Version"
       description: What version of the server?
-      placeholder: "10.11.3"
+      placeholder: "10.11.6"
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/03-question.yml b/.github/ISSUE_TEMPLATE/03-question.yml
deleted file mode 100644
index bd10bd46..00000000
--- a/.github/ISSUE_TEMPLATE/03-question.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: "Question"
-description: Ask a question
-title: "[QST] - <title>"
-labels: [
-  "question"
-]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: "Question"
-      description: Please enter your question
-      placeholder: "How do I...?"
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..1ba6fdae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: New feature / UI suggestion
+    url: https://github.com/damontecres/Wholphin/discussions/new?category=ideas
+    about: Please request new features here
+  - name: Questions
+    url: https://github.com/damontecres/Wholphin/discussions/new?category=general
+    about: Please ask questions here