diff --git a/.github/ISSUE_TEMPLATE/x-plorers-prep.yml b/.github/ISSUE_TEMPLATE/ex-prep.yml
similarity index 70%
rename from .github/ISSUE_TEMPLATE/x-plorers-prep.yml
rename to .github/ISSUE_TEMPLATE/ex-prep.yml
index 54d60b5..bc9fcb9 100644
--- a/.github/ISSUE_TEMPLATE/x-plorers-prep.yml
+++ b/.github/ISSUE_TEMPLATE/ex-prep.yml
@@ -1,32 +1,28 @@
-name: X-Plorers – Prep task
+name: EX – Prep task
 description: A preparatory task without direct user value
-title: "[Prep] ..."
-labels: ["App: ElementX Android", "App: ElementX iOS", "T-Prep", "Team: Element X Feature"]
+title: "[Prep] <title>"
+labels: ["App: ElementX Android", "App: ElementX iOS", "T-Prep", "Team: Element X Platform"]
 
 body:
 - type: textarea
   attributes:
     label: Description
     value: |
+      Description of the task
+
+      # Acceptance criteria
+      - TBD
+
       # Size estimate
-      
       S/M/L
       
-      # Dependencies
-      
-      * None
-      
-      # Acceptance criteria
-      
-      * ...
-      * TBD: ...
+      # Dependencies    
+      - None
       
       # Out of scope
-      
-      * Nothing
+      - 
       
       # Subtasks
-      
       ```[tasklist]
       ### Android
       ```
@@ -34,6 +30,10 @@ body:
       ```[tasklist]
       ### iOS
       ```
+
+      ```[tasklist]
+      ### Rust
+      ```
       
       ```[tasklist]
       ### Other
diff --git a/.github/ISSUE_TEMPLATE/x-plorers-story.yml b/.github/ISSUE_TEMPLATE/ex-story-standalone.yml
similarity index 73%
rename from .github/ISSUE_TEMPLATE/x-plorers-story.yml
rename to .github/ISSUE_TEMPLATE/ex-story-standalone.yml
index ba939ab..7a8ea92 100644
--- a/.github/ISSUE_TEMPLATE/x-plorers-story.yml
+++ b/.github/ISSUE_TEMPLATE/ex-story-standalone.yml
@@ -1,7 +1,7 @@
-name: X-Plorers – User story
-description: A task that generates direct user value
-title: "[Story] ..."
-labels: ["App: ElementX Android", "App: ElementX iOS", "T-User Story", "Team: Element X Feature"]
+name: EX – User story
+description: Template for a standalone user story with no parent projet or epic. This a small "epic" with the appropriate process and labels that fit in the team's planning board.
+title: "[Story] <title>"
+labels: ["App: ElementX Android", "App: ElementX iOS", "T-User Story", "T-Epic", "Team: Element X Platform"]
 
 body:
 - type: textarea
@@ -16,10 +16,17 @@ body:
     label: Acceptance criteria
     value: |
       - TBD
+- type: textarea
+  attributes:
+    label: Leads
+    value: |
+      * Tech: <GitHub id>
+      * Design: <GitHub id>
 - type: dropdown
   attributes:
     label: Size estimate
     options:
+      - TBD
       - S
       - M
       - L
@@ -27,49 +34,47 @@ body:
   attributes:
     label: Dependencies
     value: |
-      - TBD
-- type: textarea
-  attributes:
-    label: Preconditions
-    value: |
-      - TBD
-- type: textarea
-  attributes:
-    label: Sign-off
-    value: |
-      ### Android
-      - [ ] Design sign-off on completion
-      - [ ] QA sign-off on completion
-      - [ ] Product sign-off on completion
-
-      ### iOS
-      - [ ] Design sign-off on completion
-      - [ ] QA sign-off on completion
-      - [ ] Product sign-off on completion
+      - None
 - type: textarea
   attributes:
     label: Out of scope
     value: |
-      - TBD
+      - 
 - type: textarea
   attributes:
     label: Open questions
     value: |
-      - TBD
+      ```[tasklist]
+      ```
 - type: textarea
   attributes:
     label: Subtasks
     value: |
       ```[tasklist]
       ### Android
-      - [ ] Verified with build in screen reader
       ```
       
       ```[tasklist]
       ### iOS
-      - [ ] Verified with build in screen reader
       ```
       
+      ```[tasklist]
+      ### Rust
+      ```
+
       ```[tasklist]
       ### Other
       ```
+- type: textarea
+  attributes:
+    label: Sign-off
+    value: |
+      ### Android
+      - [ ] Design sign-off on completion
+      - [ ] QA sign-off on completion
+      - [ ] Product sign-off on completion
+
+      ### iOS
+      - [ ] Design sign-off on completion
+      - [ ] QA sign-off on completion
+      - [ ] Product sign-off on completion
diff --git a/.github/ISSUE_TEMPLATE/ex-story.yml b/.github/ISSUE_TEMPLATE/ex-story.yml
new file mode 100644
index 0000000..17b38b3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/ex-story.yml
@@ -0,0 +1,61 @@
+name: EX – User story
+description: Template for a second-level planning issue template. It must be part of an Epic.
+title: "[Story] <title>"
+labels: ["App: ElementX Android", "App: ElementX iOS", "T-User Story", "Team: Element X Platform"]
+
+body:
+- type: textarea
+  attributes:
+    label: Description
+    value: |
+      * As a [beneficiary]
+      * I want to [objective]
+      * So that [value generated]
+- type: textarea
+  attributes:
+    label: Acceptance criteria
+    value: |
+      - TBD
+- type: dropdown
+  attributes:
+    label: Size estimate
+    options:
+      - TBD
+      - S
+      - M
+      - L
+- type: textarea
+  attributes:
+    label: Dependencies
+    value: |
+      - None
+- type: textarea
+  attributes:
+    label: Out of scope
+    value: |
+      - 
+- type: textarea
+  attributes:
+    label: Open questions
+    value: |
+      ```[tasklist]
+      ```
+- type: textarea
+  attributes:
+    label: Subtasks
+    value: |
+      ```[tasklist]
+      ### Android
+      ```
+      
+      ```[tasklist]
+      ### iOS
+      ```
+      
+      ```[tasklist]
+      ### Rust
+      ```
+
+      ```[tasklist]
+      ### Other
+      ```
diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
index f2d5973..586b477 100644
--- a/.github/workflows/triage-move-labelled.yml
+++ b/.github/workflows/triage-move-labelled.yml
@@ -69,56 +69,6 @@ jobs:
           project-url: https://github.com/orgs/element-hq/projects/43
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-  ex_plorers:
-    name: Add labelled issues to X-Plorer project
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: Element X Feature')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/73
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features1:
-    name: Add labelled issues to PS features team 1
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/56
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features2:
-    name: Add labelled issues to PS features team 2
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-      contains(github.event.issue.labels.*.name, 'A-Broadcast')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/58
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features3:
-    name: Add labelled issues to PS features team 3
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Composer-WYSIWYG')
-    steps:
-      - uses: actions/add-to-project@main
-        with:
-          project-url: https://github.com/orgs/element-hq/projects/57
-          github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
   voip:
     name: Add labelled issues to VoIP project board
     runs-on: ubuntu-latest