diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 5d92329ee27..27abcf660dd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,6 +1,7 @@
 name: Report a bug 🐛
 description: Report bugs in Blockly, so we can fix them.
-labels: 'issue: bug, issue: triage'
+type: Bug
+labels: 'status: triage'
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index aa4bd749d99..f726e819876 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,5 +3,5 @@ contact_links:
     url: https://groups.google.com/forum/#!forum/blockly
     about: Go to the Blockly developer forum, where you can ask and answer questions.
   - name: Report issues with plugins and examples 🧩
-    url: https://github.com/google/blockly-samples/issues/new/choose
+    url: https://github.com/RaspberryPiFoundation/blockly-samples/issues/new/choose
     about: File bugs or feature requests about plugins and samples in our blockly-samples repository.
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
index e3a5b118821..e3e3e58e0ec 100644
--- a/.github/ISSUE_TEMPLATE/documentation.yaml
+++ b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -1,6 +1,7 @@
 name: Report a documentation problem 📖
 description: Could our documentation be better? Tell us how.
-labels: 'issue: docs, issue: triage'
+type: Task
+labels: 'status: triage, area: docs & examples'
 body:
   - type: markdown
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 04c3fdef6e2..117a92db44f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,6 +1,7 @@
 name: Make a feature request ✨
 description: Suggest an idea to make Blockly better.
-labels: 'issue: feature request, issue: triage'
+type: Feature
+labels: 'status: triage'
 body:
   - type: markdown
     attributes: