diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index be3fb78f..89a69513 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -82,6 +82,8 @@ body:
       options:
         - Jellyfin
         - Plex
+    validations:
+      required: true
 
   - type: input
     id: device
@@ -89,6 +91,8 @@ body:
       label: Device Information
       description: What device are you using?
       placeholder: e.g., iPhone 14 Pro, Pixel 7, Chrome on macOS
+    validations:
+      required: true
 
   - type: textarea
     id: logs
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 9f5ec54d..0afe9dff 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -41,6 +41,8 @@ body:
         1. As a user, I would...
         2. This would help me...
         3. The benefit would be...
+    validations:
+      required: true
 
   - type: dropdown
     id: platform
@@ -57,17 +59,20 @@ body:
         - tvOS
         - Linux
         - All platforms
+    validations:
+      required: true
 
   - type: dropdown
     id: media-server
     attributes:
       label: Media Server
-      description: Is this for Jellyfin, Plex, or both?
+      description: Which media server(s) is this for?
       multiple: true
       options:
         - Jellyfin
         - Plex
-        - Both
+    validations:
+      required: true
 
   - type: textarea
     id: additional