diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index dabb5e408..f4e9f148c 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     name: Danger
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index b23b449aa..eecda979a 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -11,7 +11,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build')
 
     name: Release
-    runs-on: macos-14
+    runs-on: macos-15
     
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
diff --git a/.github/workflows/translations-pr.yml b/.github/workflows/translations-pr.yml
index 2c4ca11ab..5a5003fdf 100644
--- a/.github/workflows/translations-pr.yml
+++ b/.github/workflows/translations-pr.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   open-translations-pr:
-    runs-on: macos-14
+    runs-on: macos-15
     # Skip in forks
     if: github.repository == 'element-hq/element-x-ios'
     steps:
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 63fa5e54e..81be7193e 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   tests:
     name: Tests
-    runs-on: macos-14
+    runs-on: macos-15
 
     concurrency:
       # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
diff --git a/.github/workflows/unit_tests_enterprise.yml b/.github/workflows/unit_tests_enterprise.yml
index 5bc8baac3..02545643d 100644
--- a/.github/workflows/unit_tests_enterprise.yml
+++ b/.github/workflows/unit_tests_enterprise.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   tests:
     name: Tests (Enterprise)
-    runs-on: macos-14
+    runs-on: macos-15
     
     # Skip in forks
     if: github.repository == 'element-hq/element-x-ios'
diff --git a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
index b824715d3..ff62ac4e2 100644
--- a/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
+++ b/ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
@@ -368,7 +368,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
                 
                 switch info.cause {
                 case .unknown:
-                    analytics.trackError(context: nil, domain: .E2EE, name: .UnknownError, timeToDecryptMillis: timeToDecryptMs)
+                    analytics.trackError(context: nil, domain: .E2EE, name: .OlmKeysNotSentError, timeToDecryptMillis: timeToDecryptMs)
                 case .unknownDevice:
                     analytics.trackError(context: nil, domain: .E2EE, name: .ExpectedSentByInsecureDevice, timeToDecryptMillis: timeToDecryptMs)
                 case .unsignedDevice: