diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 977f978a4f..31a4db612a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,23 +1,46 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[BUG] "
+labels: bug
+assignees: ''
+
+---
+
 ### Bug Description
+
 Please provide a detailed description of the issue you encountered.
 
+### Environment Information
+
+- Operating System: [e.g., Ubuntu 20.04]
+- Python Version: [e.g., 3.10.12]
+- GPU: [e.g., NVIDIA A100-80G]
+- CUDA Version: [e.g., 12.4]
+- Installation Method: [e.g., pypi, source]
+- Trinity-RFT Version: [e.g., 0.2.1]
+- Other relevant dependencies or configurations you think might be helpful
+
 ### Steps to Reproduce
+
+Please provide a minimal, self-contained, and reproducible example.
+
 1. Step 1
 2. Step 2
 3. ...
 
 ### Expected Behavior
+
 Describe what you expected to happen.
 
 ### Actual Behavior
-Describe what actually happened.
 
-### Environment Information
-- Operating System: [e.g., Ubuntu 20.04]
-- Python Version: [e.g., 3.10.12]
-- Installation Method: [e.g., pypi, source]
-- Trinity-RFT Version: [e.g., 0.1.0]
-- Other relevant dependencies or configurations
+Describe what actually happened.
 
 ### Log Information
+
 If applicable, include any relevant log output here.
+
+### Are You Willing to Fix This Issue?
+
+- [ ] Yes, I am willing to fix this issue!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index c1eb249319..d59de8e649 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,11 +1,28 @@
+---
+name: Feature Request
+about: Suggest a new feature for the project
+title: "[FEATURE] "
+labels: enhancement
+assignees: ''
+
+---
+
 ### Feature Request
+
 Please provide a detailed description of the feature you would like to see added.
 
 ### Purpose of the Feature
+
 Explain the purpose of the feature and how it will help the project or users.
 
 ### Expected Implementation (Optional)
+
 If you have specific ideas, please describe how you expect this feature to be implemented.
 
 ### Additional Information
+
 Provide any other information that might be helpful for us to understand this feature request.
+
+### Are You Willing to Submit a PR?
+
+- [ ] Yes, I am willing to submit a PR!