diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml
index 2feffab63..eb060a389 100644
--- a/.github/workflows/ui_tests.yml
+++ b/.github/workflows/ui_tests.yml
@@ -18,11 +18,6 @@ jobs:
       cancel-in-progress: true
 
     steps:
-      - name: Setup Xcode version
-        uses: maxim-lobanov/setup-xcode@v1.4.1
-        with:
-          xcode-version: '13.4'
-
       - uses: actions/checkout@v3
         with:
           lfs: true
diff --git a/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift b/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift
index b7b0ada2a..d8d1a2af0 100644
--- a/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift
+++ b/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift
@@ -42,7 +42,8 @@ struct MockSessionVerificationControllerProxy: SessionVerificationControllerProx
     }
     
     func declineVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
-        DispatchQueue.global(qos: .background).asyncAfter(deadline: .now() + 2.0) {
+        Task.detached {
+            try await Task.sleep(nanoseconds: 2_000_000_000)
             callbacks.send(.cancelled)
         }
         
@@ -50,7 +51,8 @@ struct MockSessionVerificationControllerProxy: SessionVerificationControllerProx
     }
     
     func cancelVerification() async -> Result<Void, SessionVerificationControllerProxyError> {
-        DispatchQueue.global(qos: .background).asyncAfter(deadline: .now() + 2.0) {
+        Task.detached {
+            try await Task.sleep(nanoseconds: 2_000_000_000)
             callbacks.send(.cancelled)
         }
         
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e60d74547..28d569d1a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1,6 +1,10 @@
 require 'yaml'
 require_relative 'changelog'
 
+before_all do
+  xcversion(version: "~> 13.4")
+end
+
 lane :alpha do
 
   config_xcodegen_alpha()