diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 612413974..9193b48df 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,11 @@
 blank_issues_enabled: true
 contact_links:
-  - name: xk6-browser Community Forum
-    url: https://community.k6.io/c/xk6-browser/14
+  - name: Community Forum
+    url: https://community.grafana.com/c/grafana-k6/k6-browser/79
     about: Please ask and answer questions here.
-  - name: xk6-browser Documentation
+  - name: Documentation
     url: https://github.com/grafana/k6-docs
     about: Please add any documentation related issues here.
+  - name: Migration Guide
+    url: https://k6.io/docs/using-k6-browser/migrating-to-k6-v0-46/
+    about: Please review the guide if you're migrating to k6 v0.46+ from an older version of xk6-browser.
diff --git a/.github/ISSUE_TEMPLATE/team_issues.yaml b/.github/ISSUE_TEMPLATE/team_issues.yaml
new file mode 100644
index 000000000..86407734a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/team_issues.yaml
@@ -0,0 +1,43 @@
+name: Team issue template
+description: This template is reserved for team members.
+title: "Keep the title concise. Use the common language we can use to identify the issue."
+body:
+  - type: textarea
+    attributes:
+      label: What?
+      description: A concise (or detailed) description of this issue's goal.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Why?
+      description: A concise (or detailed) explanation of why we need this issue.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: How?
+      description: Do you have any suggestions/solutions on how to solve the issue?
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Tasks
+      description: Feel free to remove the tasklist items that are not relevant for this issue.
+      value: |
+        ```[tasklist]
+        ### Tasks
+        - [ ] Subissue
+        - [ ] PR
+        - [ ] Docs PR
+        - [ ] TypeScript Definitions PR
+        - [ ] Update the k6 release notes
+        ```
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Related PR(s)/Issue(s)
+      description: Related issues, PRs, external reference links, etc.
+    validations:
+      required: false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index db7e708df..068a8d294 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -17,14 +17,6 @@ and code of conduct https://github.com/grafana/k6/blob/master/CODE_OF_CONDUCT.md
 - [ ] I have added tests for my changes
 - [ ] I have commented on my code, particularly in hard-to-understand areas
 
-<!--
-If relevant:
-- [ ] I have updated the k6 release notes: PR link
-- [ ] I have updated the k6 documentation: PR link
-- [ ] I have updated [k6 browser get started](https://k6.io/blog/get-started-with-k6-browser/) blog: PR link
-- [ ] Generated and updated the [TypeScript definitions](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/k6/experimental/browser)
--->
-
 ## Related PR(s)/Issue(s)
 
 <!-- Does it close an issue? -->