diff --git a/.github/workflows/analyze.yaml b/.github/workflows/analyze.yaml
index 7a994547..13d9af05 100644
--- a/.github/workflows/analyze.yaml
+++ b/.github/workflows/analyze.yaml
@@ -70,14 +70,12 @@ jobs:
         with:
           path: /home/linuxbrew/.linuxbrew
           key: ${{ runner.os }}-linuxbrew
-      - name: Install swift-format 600.0.0
+      - name: Install swift-format 601.0.0
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
           eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
-          curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/402e262f48947bad849ea7793752ff16b7038406/Formula/s/swift-format.rb
-          echo 'brew "swift-format.rb"' > Brewfile
-          brew bundle
+          brew install swift-format
       - name: Save Cache
         uses: actions/cache/save@v4
         if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index 06c2b28e..293c5851 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -111,13 +111,13 @@ jobs:
           key: ${{ runner.os }}-pods-${{ hashFiles('**/*.podspec') }}
           restore-keys: |
             ${{ runner.os }}-pods-
-      - name: Select XCode 16.2
-        run: sudo xcode-select -s '/Applications/Xcode_16.2.0.app/Contents/Developer'
+      - name: Select XCode 16.4
+        run: sudo xcode-select -s '/Applications/Xcode_16.4.0.app/Contents/Developer'
       - name: Generate necessary files with flutter build
         working-directory: ${{ env.working_directory }}
         run: flutter build ios --config-only
       - name: "Run iOS native unit tests"
-        run: TEST_DEVICE='iPhone 16 Pro' TEST_OS='18.2' melos run test:ios
+        run: TEST_DEVICE='iPhone 16 Pro' TEST_OS='18.5' melos run test:ios
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
@@ -203,8 +203,8 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: ${{ runner.os }}-build-artifact
-      - name: Select XCode 16.2
-        run: sudo xcode-select -s '/Applications/Xcode_16.2.0.app/Contents/Developer'
+      - name: Select XCode 16.4
+        run: sudo xcode-select -s '/Applications/Xcode_16.4.0.app/Contents/Developer'
       - name: "Run build for iOS"
         run: melos run flutter-build-ios
       - name: Upload build artifact
@@ -331,8 +331,8 @@ jobs:
           flutter-version: "3.32.x"
           channel: "stable"
           cache: true
-      - name: Select XCode 16.2
-        run: sudo xcode-select -s '/Applications/Xcode_16.2.0.app/Contents/Developer'
+      - name: Select XCode 16.4
+        run: sudo xcode-select -s '/Applications/Xcode_16.4.0.app/Contents/Developer'
       - name: Start iOS simulator
         run: |
           SIMULATOR_NAME="iPhone 16 Pro"