diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 345009aa..62712d9f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -16,11 +16,27 @@ assignees: ''
 **Expected behavior:**
 <!-- A clear and concise description of what you expected to happen. -->
 
-**Environment information** (_Please complete the following information; remove  any unnecessary fields_) **:**
- - Affected Package: [e.g., @oxygen-ui/react, @oxygen-ui/primitives]
- - Library Version: [e.g., 1.10.0, 2.0.0-alpha]
- - OS: [e.g., Windows, Linux, Mac]
- - Browser: [e.g., Google Chrome Version 109.0.5414.119, Safari Version 15.3]
+**Additional context** **:**
+<!-- Please complete the following information. -->
+- Affected Package:
+  - [ ] @oxygen-ui/logger
+  - [ ] @oxygen-ui/primitives
+  - [ ] @oxygen-ui/react
+  - [ ] @oxygen-ui/react-icons
+- Library Version: [e.g., 1.10.0, 2.0.0-alpha]
+- OS:
+  - [ ] Windows
+  - [ ] Linux
+  - [ ] Mac
+  - [ ] Other
+- Browser:
+  - [ ] Google Chrome
+  - [ ] Firefox
+  - [ ] Safari
+  - [ ] Microsoft Edge
+  - [ ] Brave
+  - [ ] Opera
+  - [ ] Other
 
 ---
 
diff --git a/pull_request_template.md b/pull_request_template.md
index 7b94a81b..ece0ab20 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -9,6 +9,7 @@
 - Related PR `#1` or (None)
 
 ### Checklist
+- [ ] Figma Board Updated. (Mandatory for Icon and Component PRs. If you don't have access, please ask the core team to update it.)
 - [ ] UX/UI review done on the final implementation.
 - [ ] Story provided. (Add screenshots)
 - [ ] Manual test round performed and verified.