diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 98fd5201868..13857c73983 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,5 @@
 name: Bug Report
-description: Report a bug to help us improve
+description: Report a bug to help us improve.
 labels: [🐛 bug]
 body:
   - type: checkboxes
@@ -19,6 +19,8 @@ body:
         - Strawberry Shake
         - Banana Cake Pop
         - Green Donut
+    validations:
+      required: true
   - type: textarea
     id: description
     attributes:
@@ -52,18 +54,6 @@ body:
         You can attach images or log files by clicking this area to highlight it and then dragging files in.
     validations:
       required: false
-  - type: dropdown
-    id: product
-    attributes:
-      label: Product
-      description: Which of our products is affected by this bug?
-      options:
-        - Hot Chocolate
-        - Strawberry Shake
-        - Banana Cake Pop
-        - Green Donut
-    validations:
-      required: true
   - type: input
     id: version
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 9df007c570e..1abacc2fd7a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -12,6 +12,8 @@ body:
         - Strawberry Shake
         - Banana Cake Pop
         - Green Donut
+    validations:
+      required: true
   - type: textarea
     id: problem
     attributes:
@@ -26,5 +28,3 @@ body:
       description: A clear and concise description of what you want to happen.
     validations:
       required: true
-    validations:
-      required: true