diff --git a/.github/workflows/build-mobile-comment.yml b/.github/workflows/build-mobile-comment.yml
index 557cbb65..b9179f09 100644
--- a/.github/workflows/build-mobile-comment.yml
+++ b/.github/workflows/build-mobile-comment.yml
@@ -21,17 +21,17 @@ jobs:
         with:
           ref: ${{ steps.comment-branch.outputs.head_ref }}
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 21
-          cache: 'pnpm'
-
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
           version: 8
           run_install: false
+  
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+            node-version: 21
+            cache: "pnpm"
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -89,20 +89,17 @@ jobs:
         with:
           xcode-version: "15.1.0"
 
-      - name: Update xcbeautify
-        run: brew upgrade xcbeautify
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 21
-          cache: 'pnpm'
-
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
           version: 8
           run_install: false
+  
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 21
+          cache: "pnpm"
 
       - name: Cache Node Modules
         uses: actions/cache@v4
diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 452ad110..058b6d2d 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -17,18 +17,18 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 21
-          cache: "pnpm"
-
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
           version: 8
           run_install: false
 
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 21
+          cache: "pnpm"
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -80,8 +80,11 @@ jobs:
         with:
           xcode-version: "15.1.0"
 
-      - name: Update xcbeautify
-        run: brew upgrade xcbeautify
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
 
       - name: Install Node.js
         uses: actions/setup-node@v4
@@ -89,12 +92,6 @@ jobs:
           node-version: 21
           cache: "pnpm"
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
       - name: Cache Node Modules
         uses: actions/cache@v4
         with:
diff --git a/.github/workflows/release-mobile.yml b/.github/workflows/release-mobile.yml
index 04cc9c55..2b5fd681 100644
--- a/.github/workflows/release-mobile.yml
+++ b/.github/workflows/release-mobile.yml
@@ -41,18 +41,18 @@ jobs:
       - name: Pull version bump
         run: git pull --all
 
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+            version: 8
+            run_install: false
+
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 21
           cache: "pnpm"
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -108,8 +108,11 @@ jobs:
         with:
           xcode-version: "15.1.0"
 
-      - name: Update xcbeautify
-        run: brew upgrade xcbeautify
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
 
       - name: Install Node.js
         uses: actions/setup-node@v4
@@ -117,12 +120,6 @@ jobs:
           node-version: 21
           cache: "pnpm"
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
       - name: Cache Node Modules
         uses: actions/cache@v4
         with: