diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 4a2a46675..fda11be8d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,11 +10,11 @@ assignees: ""
 
 To ensure efficient investigation of the issue, please fill out the fields below with as much detail as possible. **Reports that do not follow this template may be closed without notification.** We appreciate your cooperation.
 
-## Describe the bug
+## 🐞Describe the bug
 
 A clear and concise description of what the bug is.
 
-## To Reproduce
+## 🔄 To Reproduce
 
 Steps to reproduce the behavior:
 
@@ -23,10 +23,21 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-## Screenshots
+## 📷 Screenshots
 
 If applicable, add screenshots to help explain your problem.
 
-## Additional context
+## 🔎 Logs for Chat Issues
+
+If the issue occurs during a chat interaction, please check the following logs on Amazon Cloudwatch Logs and include the relevant entries in your issue:
+
+- `/aws/lambda/BedrockChatStack-BackendApiHandlerXXXX`
+- `/aws/lambda/BedrockChatStack-WebSocketHandlerXXXX`
+
+## 🔎 Logs for Bot Creation/Update Issues
+
+If the issue occurs during bot creation or updating, please check the execution records of the AWS Step Functions state machine named `EmbeddingStateMachineXXX` and include the details in your issue.
+
+## 📝 Additional context
 
 Add any other context about the problem here.
diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml
new file mode 100644
index 000000000..af5de9f42
--- /dev/null
+++ b/.github/workflows/auto-label.yml
@@ -0,0 +1,20 @@
+name: Add 'needs triage' label
+
+on:
+  issues:
+    types:
+      - opened
+  pull_request:
+    types:
+      - opened
+
+jobs:
+  add-label:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Add 'needs triage' label
+        uses: actions-ecosystem/action-add-labels@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "needs-triage"