diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d683f21e76c33d..6970a30b58d7aa 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,8 @@
-name: Bug Report
+name: Bug report
 description: File a bug report
+labels: ["type: bug", "untriaged"]
+assignees:
+  - bazelbuild/triage
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/doc_issue.yml b/.github/ISSUE_TEMPLATE/doc_issue.yml
index 00c95f225797ce..a802de7e4ff546 100644
--- a/.github/ISSUE_TEMPLATE/doc_issue.yml
+++ b/.github/ISSUE_TEMPLATE/doc_issue.yml
@@ -1,5 +1,8 @@
-name: bazel.build doc issue
-description: File a documentation issue through bazel.build's "Report an Issue" button
+name: Documentation issue
+description: File a documentation issue (through bazel.build's "report an issue" button)
+labels: ["type: documentation (cleanup)", "untriaged", "team-Documentation"]
+assignees:
+  - bazelbuild/triage
 body:
   - type: input
     id: link
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 05c4cf1473a4e3..81454bbd7642a6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,5 +1,8 @@
-name: Feature Request
+name: Feature request
 description: Suggest a new feature
+labels: ["type: feature request", "untriaged"]
+assignees:
+  - bazelbuild/triage
 body:
   - type: markdown
     attributes:
diff --git a/site/en/_buttons.html b/site/en/_buttons.html
index 1a1b675034f165..f9d28e6232426a 100644
--- a/site/en/_buttons.html
+++ b/site/en/_buttons.html
@@ -1,4 +1,4 @@
-<a class="button button-with-icon" href="https://github.com/bazelbuild/bazel/issues/new?title=%5Bbazel.build%5D+Problem+with+{% dynamic print request.path %}&labels=team-Documentation&template=doc_issue.yml&link=https%3A%2F%2Fbazel.build{% dynamic print request.path %}" target="_blank">
+<a class="button button-with-icon" href="https://github.com/bazelbuild/bazel/issues/new?title=%5Bbazel.build%5D+Problem+with+{% dynamic print request.path %}&template=doc_issue.yml&link=https%3A%2F%2Fbazel.build{% dynamic print request.path %}" target="_blank">
   Report an issue<span class="material-icons icon-after" aria-hidden="true">open_in_new</span>
 </a>
 {% dynamic if not setvar.source_file %}