diff --git a/.github/ISSUE_TEMPLATE/01_bug.md b/.github/ISSUE_TEMPLATE/01_bug.md
index 94d7b857..2e35440b 100644
--- a/.github/ISSUE_TEMPLATE/01_bug.md
+++ b/.github/ISSUE_TEMPLATE/01_bug.md
@@ -2,7 +2,6 @@
 name: Bug report
 about: Report a problem or unexpected behavior
 title: ""
-labels: bug, triage
 assignees:
 ---
 
@@ -12,9 +11,9 @@ Use English with clear and concise description of the bug, if you just have a qu
 
 ## Environment
 
-- OS: [e.g., macOS, Windows, Linux]
-- Browser: [e.g., Chrome, Firefox, Safari]
-- Version: [e.g., 1.0.0]
+- GPUI: [e.g., v0.2.2]
+- GPUI Component: [e.g., v0.4.0]
+- Platform: [e.g., macOS 26, Windows 11, Ubuntu 20.04]
 
 ## Steps to Reproduce
 
diff --git a/.github/PULL_REQUEST_TEMPLATE/01_bug_fix.md b/.github/pull_request_template.md
similarity index 86%
rename from .github/PULL_REQUEST_TEMPLATE/01_bug_fix.md
rename to .github/pull_request_template.md
index 3650855e..8ad39c2e 100644
--- a/.github/PULL_REQUEST_TEMPLATE/01_bug_fix.md
+++ b/.github/pull_request_template.md
@@ -1,11 +1,3 @@
----
-name: Pull Request
-about: Submit a pull request to fix a bug or add a feature.
-title: "[component name]: Fix [short description]"
-labels: enhancement, review-needed
-assignees:
----
-
 Closes #[issue number]
 
 ## Description