diff --git a/.github/ISSUE_TEMPLATE/bug_template.yml b/.github/ISSUE_TEMPLATE/bug_template.yml
index 8bb30192524cb..32e50c1833ddc 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.yml
+++ b/.github/ISSUE_TEMPLATE/bug_template.yml
@@ -12,31 +12,31 @@ body:
   - type: dropdown
     attributes:
       label: Related component
-      description: Choose one specific OpenSearch component your problem belongs to.
+      description: Choose a specific OpenSearch component your bug belongs to.  If you are unsure which to select or if the component is not present, select "Other".
       multiple: false
       options:
-        - Search:Resiliency
+        - Build Libraries & Interfaces
+        - Cluster Manager
+        - Extensions
+        - Indexing
+        - Indexing:Performance
+        - Indexing:Replication
+        - Other
+        - Plugins
+        - Search
+        - Search:Aggregations
         - Search:Performance
         - Search:Query Capabilities
         - Search:Query Insights
-        - Search:Aggregations
-        - Search:Remote Search
         - Search:Relevance
+        - Search:Remote Search
+        - Search:Resiliency
         - Search:Searchable Snapshots
-        - Search
-        - Indexing:Replication
-        - Indexing:Performance
-        - Indexing
-        - Storage:Snapshots
-        - Storage:Performance
+        - Storage
         - Storage:Durability
+        - Storage:Performance
         - Storage:Remote
-        - Storage
-        - Cluster Manager
-        - Extensions
-        - Build Libraries & Interfaces
-        - Plugins
-        - Others
+        - Storage:Snapshots
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index d90de1c67207e..fe920a22e4e5c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -19,31 +19,31 @@ body:
   - type: dropdown
     attributes:
       label: Related component
-      description: Choose one specific OpenSearch component your feature request belongs to.
+      description: Choose a specific OpenSearch component your feature request belongs to.  If you are unsure of which component to select or if the component is not present, select "Other".
       multiple: false
       options:
-        - Search:Resiliency
+        - Build Libraries & Interfaces
+        - Cluster Manager
+        - Extensions
+        - Indexing
+        - Indexing:Performance
+        - Indexing:Replication
+        - Other
+        - Plugins
+        - Search
+        - Search:Aggregations
         - Search:Performance
         - Search:Query Capabilities
         - Search:Query Insights
-        - Search:Aggregations
-        - Search:Remote Search
         - Search:Relevance
+        - Search:Remote Search
+        - Search:Resiliency
         - Search:Searchable Snapshots
-        - Search
-        - Indexing:Replication
-        - Indexing:Performance
-        - Indexing
-        - Storage:Snapshots
-        - Storage:Performance
+        - Storage
         - Storage:Durability
+        - Storage:Performance
         - Storage:Remote
-        - Storage
-        - Cluster Manager
-        - Extensions
-        - Build Libraries & Interfaces
-        - Plugins
-        - Others
+        - Storage:Snapshots
     validations:
       required: true
   - type: textarea