diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 529bcf01..be3fb78f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -68,10 +68,21 @@ body:
         - Windows
         - macOS
         - Android TV
+        - tvOS
         - Linux
     validations:
       required: true
 
+  - type: dropdown
+    id: media-server
+    attributes:
+      label: Media Server
+      description: Are you using Jellyfin or Plex?
+      multiple: true
+      options:
+        - Jellyfin
+        - Plex
+
   - type: input
     id: device
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 30dbd42c..1505e978 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -54,9 +54,20 @@ body:
         - Windows
         - macOS
         - Android TV
+        - tvOS
         - Linux
         - All platforms
 
+  - type: dropdown
+    id: media-server
+    attributes:
+      label: Media Server
+      description: Is this for Jellyfin, Plex, or both?
+      multiple: true
+      options:
+        - Jellyfin
+        - Plex
+
   - type: textarea
     id: additional
     attributes: