diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_template.md
deleted file mode 100644
index f4404cb97866a..0000000000000
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: 🐛 Bug report Old
-about: Create a report to help us improve
-title: "[BUG]"
-labels: 'bug, untriaged'
-assignees: ''
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Plugins**
-Please list all plugins currently enabled.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Host/Environment (please complete the following information):**
- - OS: [e.g. iOS]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_template.yml b/.github/ISSUE_TEMPLATE/bug_template.yml
index fa5b4c7e70748..9f3ea8514c746 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.yml
+++ b/.github/ISSUE_TEMPLATE/bug_template.yml
@@ -9,10 +9,39 @@ body:
       description: A clear and concise description of what the bug is.
     validations:
       required: true
+  - type: dropdown
+    attributes:
+      label: Choose the component label
+      description: Choose which specific components of OpenSearch your problem belongs to. For more context please refer to #10566
+      multiple: false
+      options:
+        - Search:Resiliency
+        - Search:Performance
+        - Search:Query Capabilities
+        - Search:Query Insights
+        - Search:Aggregations
+        - Search:Remote Search
+        - Search:Relevance
+        - Search:Searchable Snapshots
+        - Search
+        - Indexing:Replication
+        - Indexing:Performance
+        - Indexing
+        - Storage:Snapshots
+        - Storage:Performance
+        - Storage:Durability
+        - Storage:Remote
+        - Storage
+        - Cluster Manager
+        - Extensions
+        - Build Libraries & Interfaces
+        - Plugins
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: To Reproduce
-      description: Steps to reproduce the behavior
+      description: Steps to reproduce the behavior.
       value: |
         1. Go to '...'
         2. Click on '....'
@@ -29,12 +58,12 @@ body:
   - type: textarea
     attributes:
       label: Documents, Screenshots
-      description: If applicable, add more information like log files or screenshoots to help explain your problem.
+      description: If applicable, please attach more information in this area, like log files or screenshoots, to help explain your problem.
     validations:
       required: false
   - type: textarea
     attributes:
-      label: Host/Environment (please complete the following information)
+      label: Host/Environment
       value: |
         - OS: [e.g. iOS]
         - Version [e.g. 22]