diff --git a/.github/ISSUE_TEMPLATE/bug_template.yml b/.github/ISSUE_TEMPLATE/bug_template.yml
index 00492baba7e3d..ba6b12f51f3dd 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.yml
+++ b/.github/ISSUE_TEMPLATE/bug_template.yml
@@ -15,17 +15,16 @@ body:
       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:
+        - Other
         - Build
         - Clients
         - Cluster Manager
         - Extensions
-        - Indexing
         - Indexing:Performance
         - Indexing:Replication
+        - Indexing
         - Libraries
-        - Other
         - Plugins
-        - Search
         - Search:Aggregations
         - Search:Performance
         - Search:Query Capabilities
@@ -34,11 +33,12 @@ body:
         - Search:Remote Search
         - Search:Resiliency
         - Search:Searchable Snapshots
-        - Storage
+        - Search
         - Storage:Durability
         - Storage:Performance
         - Storage:Remote
         - Storage:Snapshots
+        - Storage
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 413ec690f036e..d93ac8b590706 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -22,17 +22,16 @@ body:
       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:
+        - Other
         - Build
         - Clients
         - Cluster Manager
         - Extensions
-        - Indexing
         - Indexing:Performance
         - Indexing:Replication
+        - Indexing
         - Libraries
-        - Other
         - Plugins
-        - Search
         - Search:Aggregations
         - Search:Performance
         - Search:Query Capabilities
@@ -41,11 +40,12 @@ body:
         - Search:Remote Search
         - Search:Resiliency
         - Search:Searchable Snapshots
-        - Storage
+        - Search
         - Storage:Durability
         - Storage:Performance
         - Storage:Remote
         - Storage:Snapshots
+        - Storage
     validations:
       required: true
   - type: textarea