diff --git a/.github/ISSUE_TEMPLATE/bug-desktop.yml b/.github/ISSUE_TEMPLATE/bug-desktop.yml
deleted file mode 100644
index be3d623d8..000000000
--- a/.github/ISSUE_TEMPLATE/bug-desktop.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: Bug report for the Element desktop app (not in a browser)
-description: File a bug report if you are using the desktop Element application.
-labels: [T-Defect]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        Please report security issues by email to security@matrix.org
-  - type: textarea
-    id: reproduction-steps
-    attributes:
-      label: Steps to reproduce
-      description: Please attach screenshots, videos or logs if you can.
-      placeholder: Tell us what you see!
-      value: |
-        1. Where are you starting? What can you see?
-        2. What do you click?
-        3. More steps…
-    validations:
-      required: true
-  - type: textarea
-    id: result
-    attributes:
-      label: Outcome
-      placeholder: Tell us what went wrong
-      value: |
-        #### What did you expect?
-
-        #### What happened instead?
-    validations:
-      required: true
-  - type: input
-    id: os
-    attributes:
-      label: Operating system
-      placeholder: Windows, macOS, Ubuntu, Arch Linux…
-    validations:
-      required: false
-  - type: input
-    id: version
-    attributes:
-      label: Application version
-      description: You can find the version information in Settings -> Help & About. 
-      placeholder: e.g. Element version 1.7.34, olm version 3.2.3 
-    validations:
-      required: false
-  - type: input
-    id: source
-    attributes:
-      label: How did you install the app?
-      description: Where did you install the app from? Please give a link or a description.
-      placeholder: e.g. From https://element.io/get-started
-    validations:
-      required: false
-  - type: input
-    id: homeserver
-    attributes:
-      label: Homeserver
-      description: |
-        Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
-      placeholder: e.g. matrix.org or Synapse 1.50.0rc1
-    validations:
-      required: false
-  - type: dropdown
-    id: rageshake
-    attributes:
-      label: Will you send logs?
-      description:  |
-        Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug-web.yml b/.github/ISSUE_TEMPLATE/bug-web.yml
index 99691f8a7..5c5bd14e9 100644
--- a/.github/ISSUE_TEMPLATE/bug-web.yml
+++ b/.github/ISSUE_TEMPLATE/bug-web.yml
@@ -1,6 +1,6 @@
 name: Bug report for Element Web (in browser)
 description: File a bug report if you are using Element in a web browser like Firefox, Chrome, Edge, and so on.
-labels: [T-Defect]
+labels: [web, v4, bug]
 body:
   - type: markdown
     attributes:
@@ -42,7 +42,7 @@ body:
     id: browser
     attributes:
       label: Browser information
-      description: Which browser are you using? Which version? 
+      description: Which browser are you using? Which version?
       placeholder: e.g. Chromium Version 92.0.4515.131
     validations:
       required: false
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
index 5d9cfb3c8..f0b5f1bd6 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -1,6 +1,6 @@
 name: Enhancement request
 description: Do you have a suggestion or feature request?
-labels: [T-Enhancement]
+labels: [web, v4, enhancement]
 body:
   - type: markdown
     attributes:
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index f0c6e9856..90287951d 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -10,6 +10,6 @@ jobs:
     steps:
       - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
         with:
-          project: Issue triage
-          column: Incoming
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+          project: Tchap all issues
+          column: New issues
+          repo-token: ${{ secrets.TRIAGE_TOKEN }}