diff --git a/.github/workflows/compatibility-matrix-testing.yml b/.github/workflows/compatibility-matrix-testing.yml
new file mode 100644
index 00000000000..2b558e7ced8
--- /dev/null
+++ b/.github/workflows/compatibility-matrix-testing.yml
@@ -0,0 +1,102 @@
+name: Compatibility Matrix Testing
+
+on:
+  workflow_dispatch:
+    inputs:
+      CMT_MATRIX:
+        description: "A JSON object representing the testing matrix"
+        required: true
+        type: string
+      MOBILE_VERSION:
+        description: "The mattermost mobile version to test"
+        required: true
+
+jobs:
+  ## This is picked up after the finish for cleanup
+  upload-cmt-server-detals:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: cmt/generate-instance-details-file
+        run: echo '${{ inputs.CMT_MATRIX }}' > instance-details.json
+
+      - name: cmt/upload-instance-details
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        with:
+          name: instance-details.json
+          path: instance-details.json
+          retention-days: 1
+
+  calculate-commit-hash:
+    runs-on: ubuntu-22.04
+    outputs:
+      MOBILE_SHA: ${{ steps.repo.outputs.MOBILE_SHA }}
+    steps:
+      - name: cmt/checkout-mobile
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ inputs.MOBILE_VERSION }}
+
+      - name: cmt/calculate-mattermost-sha
+        id: repo
+        run: echo "MOBILE_SHA=$(git rev-parse HEAD)" >> ${GITHUB_OUTPUT}
+
+  update-initial-status:
+    runs-on: ubuntu-22.04
+    needs:
+      - calculate-commit-hash
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@746563b58e737a17a8ceb00b84a813b9e6e1b236
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ needs.calculate-commit-hash.outputs.MOBILE_SHA }}
+          context: e2e/compatibility-matrix-testing
+          description: "Compatibility Matrix Testing for ${{ inputs.MOBILE_VERSION }} version"
+          status: pending
+
+  # Input follows the below schema
+  # {
+  #   "server": [
+  #     {
+  #       "version": "9.6.1",
+  #       "url": "https://delivery-cmt-8467830017-9-6-1.test.mattermost.cloud/"
+  #     },
+  #     {
+  #       "version": "9.5.2",
+  #       "url": "https://delivery-cmt-8467830017-9-5-2.test.mattermost.cloud/"
+  #     }
+  #   ]
+  # }
+  detox-e2e:
+    name: mobile-cmt-${{ matrix.server.version }}
+    uses: ./.github/workflows/e2e-detox-template.yml
+    needs:
+      - update-initial-status
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(inputs.CMT_MATRIX) }}
+    secrets: inherit
+    with:
+      run-ios-tests: true
+      run-android-tests: false
+      run-type: "RELEASE"
+      MM_TEST_SERVER_URL: ${{ matrix.server.url }}
+      MOBILE_VERSION: ${{ inputs.MOBILE_VERSION }}
+
+  update-final-status:
+    runs-on: ubuntu-22.04
+    needs:
+      - calculate-commit-hash
+      - detox-e2e
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ needs.calculate-commit-hash.outputs.MOBILE_SHA }}
+          context: e2e/compatibility-matrix-testing
+          description: Compatibility Matrix Testing for ${{ inputs.MOBILE_VERSION }} version
+          status: ${{ needs.detox-e2e.outputs.STATUS }}
+          target_url: ${{ needs.detox-e2e.outputs.TARGET_URL }}
diff --git a/.github/workflows/e2e-detox-pr.yml b/.github/workflows/e2e-detox-pr.yml
new file mode 100644
index 00000000000..aa908875035
--- /dev/null
+++ b/.github/workflows/e2e-detox-pr.yml
@@ -0,0 +1,83 @@
+name: Detox E2E Tests PR
+
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - labeled
+
+jobs:
+  update-initial-status:
+    runs-on: ubuntu-22.04
+    if: contains(github.event.pull_request.labels.*.name, 'E2E iOS tests for PR')
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ github.event.pull_request.head.sha }}
+          context: e2e/detox-tests
+          description: Detox tests for mattermost mobile app have started ...
+          status: pending
+
+  run-ios-tests-on-pr:
+    name: iOS Mobile Tests on PR
+    uses: ./.github/workflows/e2e-detox-template.yml
+    needs:
+      - update-initial-status
+    with:
+      run-ios-tests: true
+      run-android-tests: false
+      run-type: "PR"
+      MOBILE_VERSION: ${{ github.event.pull_request.head.sha }}
+    secrets: inherit
+
+  update-final-status:
+    runs-on: ubuntu-22.04
+    needs:
+      - run-ios-tests-on-pr
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ github.event.pull_request.head.sha }}
+          context: e2e/detox-tests
+          description: Completed with ${{ needs.run-ios-tests-on-pr.outputs.FAILURES }} failures
+          status: ${{ needs.run-ios-tests-on-pr.outputs.STATUS }}
+          target_url: ${{ needs.run-ios-tests-on-pr.outputs.TARGET_URL }}
+
+  e2e-remove-label:
+    runs-on: ubuntu-22.04
+    needs:
+      - run-ios-tests-on-pr
+    steps:
+      - name: e2e/remove-label-from-pr
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        continue-on-error: true # Label might have been removed manually
+        with:
+          script: |
+            const iosLabel = 'E2E iOS tests for PR';
+            const androidLabel = 'E2E Android tests for PR';
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+
+            if (labels.includes(iosLabel)) {
+              github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: iosLabel,
+              });
+            }
+
+            if (labels.includes(androidLabel)) {
+              github.rest.issues.removeLabel({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: androidLabel,
+              });
+            }
diff --git a/.github/workflows/e2e-detox-release.yml b/.github/workflows/e2e-detox-release.yml
new file mode 100644
index 00000000000..17fb94abab0
--- /dev/null
+++ b/.github/workflows/e2e-detox-release.yml
@@ -0,0 +1,47 @@
+name: Detox E2E Tests Release
+
+on:
+  push:
+    branches:
+      - release-*
+
+jobs:
+  update-initial-status:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ github.sha }}
+          context: e2e/detox-tests
+          description: Detox tests for mattermost mobile app have started ...
+          status: pending
+
+  run-ios-tests-on-release:
+    name: iOS Mobile Tests on Release
+    uses: ./.github/workflows/e2e-detox-template.yml
+    if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release-') }}
+    with:
+      run-ios-tests: true
+      run-android-tests: false
+      run-type: "RELEASE"
+      MOBILE_VERSION: ${{ github.ref }}
+    secrets: inherit
+
+  update-final-status:
+    runs-on: ubuntu-22.04
+    needs:
+      - run-ios-tests-on-release
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ github.sha }}
+          context: e2e/detox-tests
+          description: Completed with ${{ needs.run-ios-tests-on-release.outputs.FAILURES }} failures
+          status: ${{ needs.run-ios-tests-on-release.outputs.STATUS }}
+          target_url: ${{ needs.run-ios-tests-on-release.outputs.TARGET_URL }}
diff --git a/.github/workflows/e2e-detox-scheduled.yml b/.github/workflows/e2e-detox-scheduled.yml
new file mode 100644
index 00000000000..9734956c692
--- /dev/null
+++ b/.github/workflows/e2e-detox-scheduled.yml
@@ -0,0 +1,45 @@
+name: Detox E2E Tests (Scheduled)
+
+on:
+  schedule:
+    - cron: "0 0 * * *" # every day at midnight
+
+jobs:
+  update-initial-status:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ github.sha }}
+          context: e2e/detox-tests
+          description: Detox tests for mattermost mobile app have started ...
+          status: pending
+
+  run-ios-tests-on-main-scheduled:
+    name: iOS Mobile Tests on Main (Scheduled)
+    uses: ./.github/workflows/e2e-detox-template.yml
+    with:
+      run-ios-tests: true
+      run-android-tests: false
+      run-type: "MAIN"
+      MOBILE_VERSION: ${{ github.ref }}
+    secrets: inherit
+
+  update-final-status:
+    runs-on: ubuntu-22.04
+    needs:
+      - run-ios-tests-on-main-scheduled
+    steps:
+      - uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ github.sha }}
+          context: e2e/detox-tests
+          description: Completed with ${{ needs.run-ios-tests-on-main-scheduled.outputs.FAILURES }} failures
+          status: ${{ needs.run-ios-tests-on-main-scheduled.outputs.STATUS }}
+          target_url: ${{ needs.run-ios-tests-on-main-scheduled.outputs.TARGET_URL }}
diff --git a/.github/workflows/e2e-detox-ci-template.yml b/.github/workflows/e2e-detox-template.yml
similarity index 56%
rename from .github/workflows/e2e-detox-ci-template.yml
rename to .github/workflows/e2e-detox-template.yml
index 3469d6cf601..94b2f07d1c9 100644
--- a/.github/workflows/e2e-detox-ci-template.yml
+++ b/.github/workflows/e2e-detox-template.yml
@@ -3,85 +3,84 @@ name: Detox E2E Tests Template
 on:
   workflow_call:
     inputs:
+      MM_TEST_SERVER_URL:
+        description: "The test server URL"
+        required: false
+        type: string
+      MM_TEST_USER_NAME:
+        description: "The admin username of the test instance"
+        required: false
+        type: string
+      MM_TEST_PASSWORD:
+        description: "The admin password of the test instance"
+        required: false
+        type: string
+      MOBILE_VERSION:
+        description: "The mobile version to test"
+        required: false
+        default: ${{ github.head_ref || github.ref }}
+        type: string
       run-ios-tests:
-        description: 'Run iOS tests'
+        description: "Run iOS tests"
         required: true
         type: boolean
       run-android-tests:
-        description: 'Run Android tests'
+        description: "Run Android tests"
         required: true
         type: boolean
-      remove-pr-label:
-        description: 'Remove PR label'
-        required: false
-        type: boolean
-        default: false
-      status_check_context:
-        type: string
-        required: true
-      commit_sha:
-        type: string
-        required: true
       run-type:
         type: string
         required: false
-        default: 'PR'
+        default: "PR"
       testcase_failure_fatal:
-        description: 'Should failures be considered fatal'
+        description: "Should failures be considered fatal"
         required: false
         type: boolean
         default: false
+    outputs:
+      STATUS:
+        value: ${{ jobs.download-e2e-results.outputs.STATUS }}
+      TARGET_URL:
+        value: ${{ jobs.download-e2e-results.outputs.TARGET_URL }}
+      FAILURES:
+        value: ${{ jobs.download-e2e-results.outputs.FAILURES }}
 
 env:
-  AWS_REGION: 'us-east-1'
+  AWS_REGION: "us-east-1"
   ADMIN_EMAIL: ${{ secrets.MM_MOBILE_E2E_ADMIN_EMAIL }}
-  ADMIN_USERNAME: ${{ secrets.MM_MOBILE_E2E_ADMIN_USERNAME }}
-  ADMIN_PASSWORD: ${{ secrets.MM_MOBILE_E2E_ADMIN_PASSWORD }}
-  BRANCH: ${{ github.head_ref || github.ref_name }} 
-  COMMIT_HASH: ${{ github.sha }}
-  DETOX_AWS_S3_BUCKET: 'mattermost-detox-report'
-  DETOX_AWS_ACCESS_KEY_ID: ${{ secrets.MM_MOBILE_DETOX_AWS_ACCESS_KEY_ID }}
-  DETOX_AWS_SECRET_ACCESS_KEY: ${{ secrets.MM_MOBILE_DETOX_AWS_SECRET_ACCESS_KEY }}
-  HEADLESS: 'true'
+  ADMIN_USERNAME: ${{ inputs.MM_TEST_USER_NAME || secrets.MM_MOBILE_E2E_ADMIN_USERNAME }}
+  ADMIN_PASSWORD: ${{ inputs.MM_TEST_PASSWORD || secrets.MM_MOBILE_E2E_ADMIN_PASSWORD }}
+  DETOX_AWS_S3_BUCKET: "mattermost-detox-report"
+  HEADLESS: "true"
   TYPE: ${{ inputs.run-type }}
-  PULL_REQUEST: 'https://github.com/mattermost/mattermost-mobile/pull/${{ github.event.number }}'
-  SITE_1_URL: ${{ secrets.MM_MOBILE_E2E_SITE_1_URL }}
+  PULL_REQUEST: "https://github.com/mattermost/mattermost-mobile/pull/${{ github.event.number }}"
+  SITE_1_URL: ${{ inputs.MM_TEST_SERVER_URL || secrets.MM_MOBILE_E2E_SITE_1_URL }}
   SITE_2_URL: ${{ secrets.MM_MOBILE_E2E_SITE_2_URL }}
   SITE_3_URL: ${{ secrets.MM_MOBILE_E2E_SITE_3_URL }}
   ZEPHYR_ENABLE: false
-  JIRA_PROJECT_KEY: 'MM'
+  JIRA_PROJECT_KEY: "MM"
   ZEPHYR_API_KEY: ${{ secrets.MM_MOBILE_E2E_ZEPHYR_API_KEY }}
-  ZEPHYR_FOLDER_ID: '3233873'
+  ZEPHYR_FOLDER_ID: "3233873"
   TEST_CYCLE_LINK_PREFIX: ${{ secrets.MM_MOBILE_E2E_TEST_CYCLE_LINK_PREFIX }}
   WEBHOOK_URL: ${{ secrets.MM_MOBILE_E2E_WEBHOOK_URL }}
   FAILURE_MESSAGE: "Something has failed"
-  
-jobs:
-  update-initial-status:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: mattermost/actions/delivery/update-commit-status@main
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ inputs.commit_sha }}
-          context: ${{ inputs.status_check_context }}
-          description: Detox tests for mattermost mobile app
-          status: pending
 
+jobs:
   generate-specs:
-    needs: update-initial-status
     runs-on: ubuntu-22.04
     if: ${{ inputs.run-ios-tests || inputs.run-android-tests }}
     outputs:
       specs: ${{ steps.generate-specs.outputs.specs }}
-      build_id: ${{ env.BUILD_ID }}
-      device_name: ${{ env.DEVICE_NAME }}
-      device_os_version: ${{ env.DEVICE_OS_VERSION }}
+      build_id: ${{ steps.resolve-device.outputs.BUILD_ID }}
+      device_name: ${{ steps.resolve-device.outputs.DEVICE_NAME }}
+      device_os_version: ${{ steps.resolve-device.outputs.DEVICE_OS_VERSION }}
+      mobile_sha: ${{ steps.resolve-device.outputs.MOBILE_SHA }}
+      mobile_ref: ${{ steps.resolve-device.outputs.MOBILE_REF }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ inputs.MOBILE_VERSION }}
 
       - name: Set Build ID
         id: resolve-device
@@ -89,11 +88,13 @@ jobs:
           cd detox
           DEVICE_NAME=$(node -p "require('./.detoxrc').devices['ios.simulator'].device.type")
           DEVICE_OS_VERSION=$(node -p "require('./.detoxrc').devices['ios.simulator'].device.os")
-          BUILD_ID="${{ github.run_id }}-$DEVICE_NAME-$DEVICE_OS_VERSION"
+          BUILD_ID="${{ github.run_id }}-${DEVICE_NAME}-${DEVICE_OS_VERSION}"
 
-          echo "BUILD_ID=$(echo ${BUILD_ID} | sed 's/ /_/g')" >> $GITHUB_ENV
-          echo "DEVICE_NAME=$(echo ${DEVICE_NAME})" >> $GITHUB_ENV
-          echo "DEVICE_OS_VERSION=$(echo ${DEVICE_OS_VERSION})" >> $GITHUB_ENV
+          echo "BUILD_ID=$(echo ${BUILD_ID} | sed 's/ /_/g')" >> ${GITHUB_OUTPUT}
+          echo "DEVICE_NAME=${DEVICE_NAME}" >> ${GITHUB_OUTPUT}
+          echo "DEVICE_OS_VERSION=${DEVICE_OS_VERSION}" >> ${GITHUB_OUTPUT}
+          echo "MOBILE_SHA=$(git rev-parse HEAD)" >> ${GITHUB_OUTPUT}
+          echo "MOBILE_REF=$(git rev-parse --abbrev-ref HEAD)" >> ${GITHUB_OUTPUT}
 
       - name: Generate Test Specs
         id: generate-specs
@@ -101,23 +102,26 @@ jobs:
         with:
           parallelism: 10
           search_path: detox/e2e/test
-          device_name: ${{ env.DEVICE_NAME }}
-          device_os_version: ${{env.DEVICE_OS_VERSION}}
+          device_name: ${{ steps.resolve-device.outputs.DEVICE_NAME }}
+          device_os_version: ${{ steps.resolve-device.outputs.DEVICE_OS_VERSION }}
 
   build-ios-simulator:
-    needs: update-initial-status
-    runs-on: macos-14-large
     if: ${{ inputs.run-ios-tests }}
+    runs-on: macos-14-large
+    needs:
+      - generate-specs
     steps:
       - name: Checkout Repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ inputs.MOBILE_VERSION }}
 
       - name: Prepare iOS Build
         uses: ./.github/actions/prepare-ios-build
 
       - name: Build iOS Simulator
         env:
-          TAG: "${{ github.ref_name }}"
+          TAG: "${{ needs.generate-specs.outputs.mobile_ref }}"
           AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_BETA_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_BETA_AWS_SECRET_ACCESS_KEY }}"
           GITHUB_TOKEN: "${{ secrets.MM_MOBILE_GITHUB_TOKEN }}"
@@ -131,13 +135,13 @@ jobs:
           path: Mattermost-simulator-x86_64.app.zip
 
   e2e-ios:
-    continue-on-error: true
-    env:
-      IOS: true
-    runs-on: macos-14-large
     name: ios-detox-e2e-${{ matrix.runId }}-${{ matrix.deviceName }}-${{ matrix.deviceOsVersion }}
     if: ${{ inputs.run-ios-tests }}
+    runs-on: macos-14-large
+    continue-on-error: true
     timeout-minutes: 40
+    env:
+      IOS: true
     needs:
       - generate-specs
       - build-ios-simulator
@@ -147,6 +151,8 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          ref: ${{ inputs.MOBILE_VERSION }}
 
       - name: ci/prepare-node-deps
         uses: ./.github/actions/prepare-node-deps
@@ -189,23 +195,33 @@ jobs:
       - generate-specs
       - e2e-ios
     outputs:
-      failures: "${{ steps.calculate-failures.outputs.failures }}"
+      TARGET_URL: ${{ steps.set-url.outputs.TARGET_URL }}
+      STATUS: ${{ steps.determine-status.outputs.STATUS }}
+      FAILURES: ${{ steps.calculate-failures.outputs.FAILURES }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-  
+        with:
+          ref: ${{ inputs.MOBILE_VERSION }}
+
       - name: ci/prepare-node-deps
         uses: ./.github/actions/prepare-node-deps
-  
+
       - name: Create artifacts directory
         run: mkdir -p detox/artifacts/
 
       - name: Download All Artifacts
-        uses:  actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+        uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
         with:
           path: detox/artifacts/
           pattern: ios-results-*
 
+      - name: Generate Report Path
+        id: s3
+        run: |
+          path="${{ needs.generate-specs.outputs.build_id }}-${{ needs.generate-specs.outputs.mobile_sha }}-${{ needs.generate-specs.outputs.mobile_ref }}"
+          echo "path=$(echo "${path}" | sed 's/\./-/g')" >> ${GITHUB_OUTPUT}
+
       - name: Save report Detox Dependencies
         id: report-link
         run: |
@@ -213,88 +229,38 @@ jobs:
           npm ci
           npm run e2e:save-report
         env:
+          DETOX_AWS_ACCESS_KEY_ID: ${{ secrets.MM_MOBILE_DETOX_AWS_ACCESS_KEY_ID }}
+          DETOX_AWS_SECRET_ACCESS_KEY: ${{ secrets.MM_MOBILE_DETOX_AWS_SECRET_ACCESS_KEY }}
           IOS: ${{ inputs.run-ios-tests }}
           BUILD_ID: ${{ needs.generate-specs.outputs.build_id }}
           DEVICE_NAME: ${{ needs.generate-specs.outputs.device_name }}
           DEVICE_OS_VERSION: ${{ needs.generate-specs.outputs.device_os_version }}
+          REPORT_PATH: ${{ steps.s3.outputs.path }}
+          ## These are needed for the MM Webhook report
+          COMMIT_HASH: ${{ needs.generate-specs.outputs.mobile_sha }}
+          BRANCH: ${{ needs.generate-specs.outputs.mobile_ref }}
 
       - name: Calculate failures
         id: calculate-failures
         run: |
           FAILURES=$(find detox/artifacts/ -name 'summary.json' | xargs -l jq -r '.stats.failures' | jq -s add)
-          echo "failures=${FAILURES}" >> $GITHUB_OUTPUT
+          echo "FAILURES=${FAILURES}" >> ${GITHUB_OUTPUT}
           echo "Detox run completed with $FAILURES failures"
 
-  update-final-status:
-    runs-on: ubuntu-22.04
-    needs:
-      - generate-specs
-      - download-e2e-results
-    steps:
       - name: Set Target URL
         id: set-url
         run: |
-          s3Folder="${{ env.BUILD_ID }}-${{ env.COMMIT_HASH }}-${{ env.BRANCH }}"
-          s3Folder=$(echo "$s3Folder" | sed 's/\./-/g')
-
           if ${{ inputs.run-ios-tests }}; then
-            echo "TARGET_URL=https://${{ env.DETOX_AWS_S3_BUCKET }}.s3.amazonaws.com/${s3Folder}/jest-stare/ios-report.html" >> $GITHUB_ENV
+            echo "TARGET_URL=https://${{ env.DETOX_AWS_S3_BUCKET }}.s3.amazonaws.com/${{ steps.s3.outputs.path }}/jest-stare/ios-report.html" >> ${GITHUB_OUTPUT}
           else
-            echo "TARGET_URL=https://${{ env.DETOX_AWS_S3_BUCKET }}.s3.amazonaws.com/${s3Folder}/jest-stare/android-report.html" >> $GITHUB_ENV
+            echo "TARGET_URL=https://${{ env.DETOX_AWS_S3_BUCKET }}.s3.amazonaws.com/${{ steps.s3.outputs.path }}/jest-stare/android-report.html" >> ${GITHUB_OUTPUT}
           fi
-        env:
-          BUILD_ID: ${{ needs.generate-specs.outputs.build_id }}
 
       - name: Determine Status
         id: determine-status
         run: |
-          if [[ ${{ needs.download-e2e-results.outputs.failures }} -gt 0 && "${{ inputs.testcase_failure_fatal }}" == "true" ]]; then
-            echo "status=failure" >> $GITHUB_ENV
+          if [[ ${{ steps.calculate-failures.outputs.failures }} -gt 0 && "${{ inputs.testcase_failure_fatal }}" == "true" ]]; then
+            echo "STATUS=failure" >> ${GITHUB_OUTPUT}
           else
-            echo "status=success" >> $GITHUB_ENV
+            echo "STATUS=success" >> ${GITHUB_OUTPUT}
           fi
-
-      - uses: mattermost/actions/delivery/update-commit-status@main
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ inputs.commit_sha }}
-          context: ${{ inputs.status_check_context }}
-          description: |
-            Completed with ${{ needs.download-e2e-results.outputs.failures }} failures
-          status: ${{ env.status }}
-          target_url: ${{ env.TARGET_URL }}
-
-  e2e-remove-label:
-    if: ${{ inputs.remove-pr-label }}
-    needs:
-      - download-e2e-results
-    runs-on: ubuntu-22.04
-    steps:
-      - name: e2e/remove-label-from-pr
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        continue-on-error: true # Label might have been removed manually
-        with:
-          script: |
-            const iosLabel = 'E2E iOS tests for PR';
-            const androidLabel = 'E2E Android tests for PR';
-            const labels = context.payload.pull_request.labels.map(label => label.name);
-  
-            if (labels.includes(iosLabel)) {
-              github.rest.issues.removeLabel({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                name: iosLabel,
-              });
-            }
-  
-            if (labels.includes(androidLabel)) {
-              github.rest.issues.removeLabel({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                name: androidLabel,
-              });
-            }
diff --git a/.github/workflows/e2e-detox.yml b/.github/workflows/e2e-detox.yml
deleted file mode 100644
index 646b2674893..00000000000
--- a/.github/workflows/e2e-detox.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-name: Detox E2E Tests
-
-on:
-  schedule:
-    - cron: '0 0 * * *'  # every day at midnight
-  push:
-    branches:
-      - 'release-*'
-  pull_request:
-    branches:
-      - 'main'
-    types:
-      - labeled
-  workflow_dispatch:
-    inputs:
-      ios_version:
-        description: 'Enter iOS version'
-        required: false
-        default: "iOS 17.4"
-        type: choice
-        options:
-          - "iOS 17.5"
-          - "iOS 17.4"
-          - "iOS 17.2"
-          - "iOS 17.0"
-      device_name:
-        description: 'Enter iOS Device Name'
-        required: false
-        default: "iPhone 15 Pro"
-        type: choice
-        options:
-          - "iPhone 15 Pro"
-          - "iPhone 15"
-          - "iPhone 14 Pro"
-          - "iPhone 14"
-jobs:
-
-  run-ios-tests-on-pr:
-    name: iOS Mobile Tests on PR
-    uses: ./.github/workflows/e2e-detox-ci-template.yml
-    if: ${{ 
-      (
-      github.event_name == 'pull_request' &&
-      github.event.pull_request.labels &&
-      contains(github.event.pull_request.labels.*.name, 'E2E iOS tests for PR')
-      )
-     }}
-    with:
-      run-ios-tests: true
-      run-android-tests: false
-      remove-pr-label: true
-      commit_sha: "${{ github.event.pull_request.head.sha || github.sha }}"
-      status_check_context: "Detox iOS Mobile Tests on PR"
-      run-type: 'PR'
-    secrets: inherit
-
-  run-ios-tests-on-release:
-    name: iOS Mobile Tests on Release
-    uses: ./.github/workflows/e2e-detox-ci-template.yml
-    if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release-') }}
-    with:
-      run-ios-tests: true
-      run-android-tests: false
-      remove-pr-label: false
-      commit_sha: "${{ github.sha }}"
-      status_check_context: "Detox iOS Mobile Tests on Release"
-      run-type: 'RELEASE'
-    secrets: inherit
-
-  run-ios-tests-on-main-scheduled:
-    name: iOS Mobile Tests on Main (Scheduled)
-    uses: ./.github/workflows/e2e-detox-ci-template.yml
-    if: ${{ github.event_name == 'schedule' && github.ref == 'refs/heads/main' }}
-    with:
-      run-ios-tests: true
-      run-android-tests: false
-      remove-pr-label: false
-      commit_sha: "${{ github.sha }}"
-      status_check_context: "Detox iOS Mobile Tests on Main (Scheduled)"
-      run-type: 'MAIN'
-    secrets: inherit
-
-  run-ios-tests-on-manual-trigger:
-    name: iOS Mobile Tests on Manual Trigger
-    uses: ./.github/workflows/e2e-detox-ci-template.yml
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    with:
-      run-ios-tests: true
-      run-android-tests: false
-      remove-pr-label: false
-      commit_sha: "${{ github.sha }}"
-      status_check_context: "Detox iOS Mobile Tests on Manual Trigger"
-      run-type: 'MANUAL'
-    secrets: inherit
diff --git a/detox/save_report.js b/detox/save_report.js
index 664cd62198d..2de5c6b5b07 100644
--- a/detox/save_report.js
+++ b/detox/save_report.js
@@ -69,6 +69,7 @@ const saveReport = async () => {
         WEBHOOK_URL,
         ZEPHYR_ENABLE,
         ZEPHYR_CYCLE_KEY,
+        REPORT_PATH,
     } = process.env;
 
     // Remove old generated reports
@@ -132,7 +133,7 @@ const saveReport = async () => {
             }
         }
     }
-    const result = await saveArtifacts();
+    const result = await saveArtifacts(REPORT_PATH);
     if (result && result.success) {
         console.log('Successfully uploaded artifacts to S3:', result.reportLink);
     }
diff --git a/detox/utils/artifacts.js b/detox/utils/artifacts.js
index d2ffcf40fcc..431d3c3da33 100644
--- a/detox/utils/artifacts.js
+++ b/detox/utils/artifacts.js
@@ -17,9 +17,6 @@ const {ARTIFACTS_DIR} = require('./constants');
 require('dotenv').config();
 
 const {
-    BRANCH,
-    BUILD_ID,
-    COMMIT_HASH,
     DETOX_AWS_S3_BUCKET,
     DETOX_AWS_ACCESS_KEY_ID,
     DETOX_AWS_SECRET_ACCESS_KEY,
@@ -38,14 +35,13 @@ function getFiles(dirPath) {
     return fs.existsSync(dirPath) ? readdir(dirPath) : [];
 }
 
-async function saveArtifacts() {
+async function saveArtifacts(s3Folder) {
     if (!DETOX_AWS_S3_BUCKET || !DETOX_AWS_ACCESS_KEY_ID || !DETOX_AWS_SECRET_ACCESS_KEY) {
         console.log('No AWS credentials found. Test artifacts not uploaded to S3.');
 
         return;
     }
 
-    const s3Folder = `${BUILD_ID}-${COMMIT_HASH}-${BRANCH}`.replace(/\./g, '-');
     const uploadPath = path.resolve(__dirname, `../${ARTIFACTS_DIR}`);
     const filesToUpload = await getFiles(uploadPath);
 
diff --git a/detox/utils/report.js b/detox/utils/report.js
index 47bd97a14c0..ab7fd95d1da 100644
--- a/detox/utils/report.js
+++ b/detox/utils/report.js
@@ -309,7 +309,6 @@ function generateTitle() {
     const {
         BRANCH,
         DETOX_AWS_S3_BUCKET,
-        BUILD_ID,
         COMMIT_HASH,
         IOS,
         PULL_REQUEST,
@@ -317,6 +316,7 @@ function generateTitle() {
         RELEASE_DATE,
         RELEASE_VERSION,
         TYPE,
+        REPORT_PATH,
     } = process.env;
 
     const platform = IOS === 'true' ? 'iOS' : 'Android';
@@ -324,7 +324,7 @@ function generateTitle() {
     const appExtension = IOS === 'true' ? 'ipa' : 'apk';
     const appFileName = `Mattermost_Beta.${appExtension}`;
     const appBuildType = 'mattermost-mobile-beta';
-    const s3Folder = `${platform.toLocaleLowerCase()}/${BUILD_ID}-${COMMIT_HASH}-${BRANCH}`.replace(/\./g, '-');
+    const s3Folder = `${platform.toLocaleLowerCase()}/${REPORT_PATH}`.replace(/\./g, '-');
     const appFilePath = IOS === 'true' ? 'Mattermost-simulator-x86_64.app.zip' : 'android/app/build/outputs/apk/release/app-release.apk';
     let buildLink = '';
     let releaseDate = '';