diff --git a/.github/workflows/cron-checks.yml b/.github/workflows/cron-checks.yml
index 7372dce31..fbc6cbc13 100644
--- a/.github/workflows/cron-checks.yml
+++ b/.github/workflows/cron-checks.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   build-test-app-and-frameworks:
     name: Build Test App and Frameworks
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
     - uses: actions/checkout@v4.1.1
     - uses: ./.github/actions/ruby-cache
@@ -41,15 +41,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - ios: 18.1
-            xcode: 16.1
+          - ios: 18.2
+            xcode: 16.2
             os: macos-15
             device: "iPhone 16 Pro"
             setup_runtime: false
           - ios: 17.5
             xcode: 15.4
             os: macos-15
-            device: "iPhone 14 Pro"
+            device: "iPhone 15 Pro"
             setup_runtime: false
           - ios: 16.4
             xcode: 15.3 # fails on 15.4
@@ -131,7 +131,6 @@ jobs:
   build-old-xcode:
     name: Build SDKs (Xcode 15)
     runs-on: macos-15
-    if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     env:
       XCODE_VERSION: "15.4"
     steps:
diff --git a/.github/workflows/release-merge.yml b/.github/workflows/release-merge.yml
index c8c29253c..250cab82c 100644
--- a/.github/workflows/release-merge.yml
+++ b/.github/workflows/release-merge.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   merge-comment:
     name: Merge release to main
-    runs-on: macos-14
+    runs-on: macos-15
     if: github.event_name == 'workflow_dispatch' || (github.event.issue.pull_request && github.event.issue.state == 'open' && github.event.comment.body == '/merge release')
     steps:
       - name: Connect Bot
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 8def5f082..893000383 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   release:
     name: Publish new release
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - name: Connect Bot
         uses: webfactory/ssh-agent@v0.7.0
diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml
index e195127c9..b96e7f0d0 100644
--- a/.github/workflows/release-start.yml
+++ b/.github/workflows/release-start.yml
@@ -32,4 +32,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_GITHUB_TOKEN }}
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
-          XCODE_VERSION: "15.4"
diff --git a/.github/workflows/sdk-size-metrics.yml b/.github/workflows/sdk-size-metrics.yml
index b2245193b..a05407b1c 100644
--- a/.github/workflows/sdk-size-metrics.yml
+++ b/.github/workflows/sdk-size-metrics.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   sdk_size:
     name: Metrics
-    runs-on: macos-14
+    runs-on: macos-15
     env:
       GITHUB_TOKEN: '${{ secrets.CI_BOT_GITHUB_TOKEN }}'
     steps:
diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml
index 756bcf8f9..9348c37e0 100644
--- a/.github/workflows/smoke-checks.yml
+++ b/.github/workflows/smoke-checks.yml
@@ -20,7 +20,7 @@ concurrency:
 
 env:
   HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
-  IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.1)"
+  IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.2)"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
 
@@ -64,7 +64,7 @@ jobs:
       run: bundle exec fastlane pod_lint
 
   build-xcode15:
-    name: Build SDKs (Xcode 15.0)
+    name: Build SDKs (Xcode 15)
     runs-on: macos-15
     if: ${{ github.event.inputs.record_snapshots != 'true' }}
     env:
@@ -104,7 +104,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.CI_BOT_GITHUB_TOKEN }} # to open a PR
     - name: Run Sonar analysis
-      if: ${{ github.event.inputs.snapshots != 'true' }}
+      if: ${{ github.event.inputs.record_snapshots != 'true' }}
       run: bundle exec fastlane sonar_upload
       env:
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
@@ -133,7 +133,7 @@ jobs:
 
   allure_testops_launch:
     name: Launch Allure TestOps
-    runs-on: macos-13
+    runs-on: macos-15
     if: ${{ github.event.inputs.record_snapshots != 'true' }}
     needs: build-test-app-and-frameworks
     outputs:
@@ -207,7 +207,7 @@ jobs:
 
   build-apps:
     name: Build Demo App
-    runs-on: macos-14
+    runs-on: macos-15
     if: ${{ github.event.inputs.record_snapshots != 'true' }}
     needs: build-test-app-and-frameworks
     steps:
diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
index 0f6e37b8f..e17d113af 100644
--- a/.github/workflows/testflight.yml
+++ b/.github/workflows/testflight.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
     - name: Connect Bot
       uses: webfactory/ssh-agent@v0.7.0
diff --git a/.github/workflows/update-copyright.yml b/.github/workflows/update-copyright.yml
index fa5f354a3..bfa07999f 100644
--- a/.github/workflows/update-copyright.yml
+++ b/.github/workflows/update-copyright.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   copyright:
     name: Copyright
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
     - uses: actions/checkout@v4.1.1
     - uses: ./.github/actions/ruby-cache
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/FileAttachmentsView_Tests/test_fileAttachmentsView_emptySnapshot.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/FileAttachmentsView_Tests/test_fileAttachmentsView_emptySnapshot.1.png
deleted file mode 100644
index cef75bb04..000000000
Binary files a/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/FileAttachmentsView_Tests/test_fileAttachmentsView_emptySnapshot.1.png and /dev/null differ
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/MediaAttachmentsView_Tests/test_mediaAttachmentsView_emptySnapshot.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/MediaAttachmentsView_Tests/test_mediaAttachmentsView_emptySnapshot.1.png
deleted file mode 100644
index f0f9f09c8..000000000
Binary files a/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/MediaAttachmentsView_Tests/test_mediaAttachmentsView_emptySnapshot.1.png and /dev/null differ
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/PinnedMessagesView_Tests/test_pinnedMessagesView_emptySnapshot.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/PinnedMessagesView_Tests/test_pinnedMessagesView_emptySnapshot.1.png
deleted file mode 100644
index 02105600d..000000000
Binary files a/StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/__Snapshots__/PinnedMessagesView_Tests/test_pinnedMessagesView_emptySnapshot.1.png and /dev/null differ
diff --git a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/GalleryView_Tests/test_galleryView_snapshotLoading.1.png b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/GalleryView_Tests/test_galleryView_snapshotLoading.1.png
index dd11b446a..9db0341e9 100644
Binary files a/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/GalleryView_Tests/test_galleryView_snapshotLoading.1.png and b/StreamChatSwiftUITests/Tests/ChatChannel/__Snapshots__/GalleryView_Tests/test_galleryView_snapshotLoading.1.png differ
diff --git a/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/NoChannelsView_Tests/test_noChannelsView_snapshot.1.png b/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/NoChannelsView_Tests/test_noChannelsView_snapshot.1.png
deleted file mode 100644
index 78485f352..000000000
Binary files a/StreamChatSwiftUITests/Tests/ChatChannelList/__Snapshots__/NoChannelsView_Tests/test_noChannelsView_snapshot.1.png and /dev/null differ
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5620b3668..d4c10bc0d 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -7,7 +7,7 @@ require 'xcodeproj'
 import 'Sonarfile'
 import 'Allurefile'
 
-xcode_version = ENV['XCODE_VERSION'] || '16.1'
+xcode_version = ENV['XCODE_VERSION'] || '16.2'
 xcode_project = 'StreamChatSwiftUI.xcodeproj'
 sdk_names = ['StreamChatSwiftUI']
 github_repo = ENV['GITHUB_REPOSITORY'] || 'GetStream/stream-chat-swiftui'
@@ -23,7 +23,7 @@ before_all do |lane|
   if is_ci
     setup_ci
     setup_git_config
-    xcversion(version: xcode_version) unless [:publish_release, :sonar_upload, :allure_launch, :allure_upload, :copyright, :pod_lint].include?(lane)
+    xcversion(version: xcode_version) unless [:sonar_upload, :allure_launch, :allure_upload, :copyright, :pod_lint].include?(lane)
   end
 end