diff --git a/.github/ISSUE_TEMPLATE/01-feature.yml b/.github/ISSUE_TEMPLATE/01-feature.yml
index e45023905..dbfa3eb16 100644
--- a/.github/ISSUE_TEMPLATE/01-feature.yml
+++ b/.github/ISSUE_TEMPLATE/01-feature.yml
@@ -4,6 +4,24 @@ labels:
 - feature
 - request
 body:
+- type: checkboxes
+  id: os
+  attributes:
+    label: Operating System
+    description: Which Operating System was related?
+    options:
+      - label: Windows
+      - label: macOS
+      - label: Linux
+      - label: FreeBSD
+      - label: OpenBSD
+      - label: Android
+      - label: iOS
+      - label: Nintendo Switch
+      - label: Xbox
+      - label: Web Browsers
+  validations:
+    required: true
 - type: textarea
   id: what
   attributes:
@@ -14,5 +32,3 @@ body:
   id: why
   attributes:
     label: Why is this needed?
-  validations:
-    required: true
diff --git a/.github/ISSUE_TEMPLATE/02-security.yml b/.github/ISSUE_TEMPLATE/02-security.yml
index 96a50414b..1a5b62ea3 100644
--- a/.github/ISSUE_TEMPLATE/02-security.yml
+++ b/.github/ISSUE_TEMPLATE/02-security.yml
@@ -2,6 +2,24 @@ name: Security Vulnerability
 description: Provide details about a security vulnerability.
 labels: security
 body:
+- type: checkboxes
+  id: os
+  attributes:
+    label: Operating System
+    description: Which Operating System was the issue on?
+    options:
+      - label: Windows
+      - label: macOS
+      - label: Linux
+      - label: FreeBSD
+      - label: OpenBSD
+      - label: Android
+      - label: iOS
+      - label: Nintendo Switch
+      - label: Xbox
+      - label: Web Browsers
+  validations:
+    required: true
 - type: textarea
   id: what
   attributes: