diff --git a/metadata/com.streetwriters.notesnook.yml b/metadata/com.streetwriters.notesnook.yml
index 5267b6fe36..eef9764cb0 100644
--- a/metadata/com.streetwriters.notesnook.yml
+++ b/metadata/com.streetwriters.notesnook.yml
@@ -11715,19 +11715,17 @@ Builds:
 
   - versionName: 3.2.10
     versionCode: 15331
-    commit: cdf6a4bb5b9c35d98966c1f80b53a56d0b99f07c
+    commit: b24830666c720ec83743947236393aea3ca0d0bb
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
-      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
-      - apt-get install -y -t trixie openjdk-21-jdk-headless
-      - update-alternatives --auto java
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v20.11.1/node-v20.11.1-linux-x64.tar.gz
-      - echo "bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7 node.tar.gz"
+      - apt-get install -y --no-install-recommends g++ build-essential
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.15.0/node-v22.15.0-linux-x64.tar.gz
+      - echo "29d1c60c5b64ccdb0bc4e5495135e68e08a872e0ae91f45d9ec34fc135a17981 node.tar.gz"
         | sha256sum -c -
       - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
-      - apt-get install -y g++ make libc-dev
+      - npm install -g yarn
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
@@ -11740,7 +11738,6 @@ Builds:
       - apps/desktop
       - apps/web
       - packages/clipper
-      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium
     prebuild:
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
@@ -11748,8 +11745,6 @@ Builds:
       - echo GITHUB_RELEASE=true > .env
       - sed -i -e 's|false|true|g' react-native.config.js
       - sed -i -e '/installReferrerVersion/,+11d' ../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e "s/project(':lazysodium')/'com.goterl:lazysodium-android:5.2.0@aar'/"
-        ../node_modules/@ammarahmed/react-native-sodium/android/build.gradle
     scanignore:
       - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
@@ -11757,6 +11752,8 @@ Builds:
       - apps/mobile/node_modules/react-native/*
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
       - apps/mobile/node_modules/react-native-blob-util/android/build.gradle
+      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
+      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium-android/app/build.gradle
       - apps/mobile/node_modules/react-native-bootsplash/android/build.gradle
       - apps/mobile/node_modules/@react-native-community/netinfo/android/build.gradle
       - apps/mobile/node_modules/react-native-device-info/android/build.gradle
@@ -11775,7 +11772,6 @@ Builds:
       - apps/mobile/node_modules/react-native-vector-icons/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
       - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
-      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
     scandelete:
       - .nx/cache
       - apps/mobile/node_modules
@@ -11790,19 +11786,17 @@ Builds:
 
   - versionName: 3.2.10
     versionCode: 15332
-    commit: cdf6a4bb5b9c35d98966c1f80b53a56d0b99f07c
+    commit: b24830666c720ec83743947236393aea3ca0d0bb
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
-      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
-      - apt-get install -y -t trixie openjdk-21-jdk-headless
-      - update-alternatives --auto java
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v20.11.1/node-v20.11.1-linux-x64.tar.gz
-      - echo "bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7 node.tar.gz"
+      - apt-get install -y --no-install-recommends g++ build-essential
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.15.0/node-v22.15.0-linux-x64.tar.gz
+      - echo "29d1c60c5b64ccdb0bc4e5495135e68e08a872e0ae91f45d9ec34fc135a17981 node.tar.gz"
         | sha256sum -c -
       - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
-      - apt-get install -y g++ make libc-dev
+      - npm install -g yarn
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
@@ -11815,7 +11809,6 @@ Builds:
       - apps/desktop
       - apps/web
       - packages/clipper
-      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium
     prebuild:
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
@@ -11823,15 +11816,15 @@ Builds:
       - echo GITHUB_RELEASE=true > .env
       - sed -i -e 's|false|true|g' react-native.config.js
       - sed -i -e '/installReferrerVersion/,+11d' ../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e "s/project(':lazysodium')/'com.goterl:lazysodium-android:5.2.0@aar'/"
-        ../node_modules/@ammarahmed/react-native-sodium/android/build.gradle
     scanignore:
       - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
       - apps/mobile/node_modules/jsc-android
       - apps/mobile/node_modules/react-native/*
+      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium-android/app/build.gradle
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
       - apps/mobile/node_modules/react-native-blob-util/android/build.gradle
+      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
       - apps/mobile/node_modules/react-native-bootsplash/android/build.gradle
       - apps/mobile/node_modules/@react-native-community/netinfo/android/build.gradle
       - apps/mobile/node_modules/react-native-device-info/android/build.gradle
@@ -11850,7 +11843,6 @@ Builds:
       - apps/mobile/node_modules/react-native-vector-icons/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
       - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
-      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
     scandelete:
       - .nx/cache
       - apps/mobile/node_modules
@@ -11865,19 +11857,17 @@ Builds:
 
   - versionName: 3.2.10
     versionCode: 15333
-    commit: cdf6a4bb5b9c35d98966c1f80b53a56d0b99f07c
+    commit: b24830666c720ec83743947236393aea3ca0d0bb
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
-      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
-      - apt-get install -y -t trixie openjdk-21-jdk-headless
-      - update-alternatives --auto java
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v20.11.1/node-v20.11.1-linux-x64.tar.gz
-      - echo "bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7 node.tar.gz"
+      - apt-get install -y --no-install-recommends g++ build-essential
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.15.0/node-v22.15.0-linux-x64.tar.gz
+      - echo "29d1c60c5b64ccdb0bc4e5495135e68e08a872e0ae91f45d9ec34fc135a17981 node.tar.gz"
         | sha256sum -c -
       - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
-      - apt-get install -y g++ make libc-dev
+      - npm install -g yarn
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
@@ -11890,7 +11880,6 @@ Builds:
       - apps/desktop
       - apps/web
       - packages/clipper
-      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium
     prebuild:
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
@@ -11898,8 +11887,6 @@ Builds:
       - echo GITHUB_RELEASE=true > .env
       - sed -i -e 's|false|true|g' react-native.config.js
       - sed -i -e '/installReferrerVersion/,+11d' ../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e "s/project(':lazysodium')/'com.goterl:lazysodium-android:5.2.0@aar'/"
-        ../node_modules/@ammarahmed/react-native-sodium/android/build.gradle
     scanignore:
       - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
@@ -11907,6 +11894,8 @@ Builds:
       - apps/mobile/node_modules/react-native/*
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
       - apps/mobile/node_modules/react-native-blob-util/android/build.gradle
+      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium-android/app/build.gradle
+      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
       - apps/mobile/node_modules/react-native-bootsplash/android/build.gradle
       - apps/mobile/node_modules/@react-native-community/netinfo/android/build.gradle
       - apps/mobile/node_modules/react-native-device-info/android/build.gradle
@@ -11925,7 +11914,6 @@ Builds:
       - apps/mobile/node_modules/react-native-vector-icons/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
       - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
-      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
     scandelete:
       - .nx/cache
       - apps/mobile/node_modules
@@ -11940,19 +11928,17 @@ Builds:
 
   - versionName: 3.2.10
     versionCode: 15334
-    commit: cdf6a4bb5b9c35d98966c1f80b53a56d0b99f07c
+    commit: b24830666c720ec83743947236393aea3ca0d0bb
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
-      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
       - apt-get update
-      - apt-get install -y -t trixie openjdk-21-jdk-headless
-      - update-alternatives --auto java
-      - curl -Lo node.tar.gz https://nodejs.org/dist/v20.11.1/node-v20.11.1-linux-x64.tar.gz
-      - echo "bf3a779bef19452da90fb88358ec2c57e0d2f882839b20dc6afc297b6aafc0d7 node.tar.gz"
+      - apt-get install -y --no-install-recommends g++ build-essential
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.15.0/node-v22.15.0-linux-x64.tar.gz
+      - echo "29d1c60c5b64ccdb0bc4e5495135e68e08a872e0ae91f45d9ec34fc135a17981 node.tar.gz"
         | sha256sum -c -
       - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
-      - apt-get install -y g++ make libc-dev
+      - npm install -g yarn
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
@@ -11965,7 +11951,6 @@ Builds:
       - apps/desktop
       - apps/web
       - packages/clipper
-      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium
     prebuild:
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
@@ -11973,15 +11958,15 @@ Builds:
       - echo GITHUB_RELEASE=true > .env
       - sed -i -e 's|false|true|g' react-native.config.js
       - sed -i -e '/installReferrerVersion/,+11d' ../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e "s/project(':lazysodium')/'com.goterl:lazysodium-android:5.2.0@aar'/"
-        ../node_modules/@ammarahmed/react-native-sodium/android/build.gradle
     scanignore:
       - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
       - apps/mobile/node_modules/jsc-android
       - apps/mobile/node_modules/react-native/*
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
+      - apps/mobile/node_modules/@ammarahmed/react-native-sodium/android/lazysodium-android/app/build.gradle
       - apps/mobile/node_modules/react-native-blob-util/android/build.gradle
+      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
       - apps/mobile/node_modules/react-native-bootsplash/android/build.gradle
       - apps/mobile/node_modules/@react-native-community/netinfo/android/build.gradle
       - apps/mobile/node_modules/react-native-device-info/android/build.gradle
@@ -12000,7 +11985,6 @@ Builds:
       - apps/mobile/node_modules/react-native-vector-icons/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
       - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
-      - apps/mobile/node_modules/react-native-pdf/android/build.gradle
     scandelete:
       - .nx/cache
       - apps/mobile/node_modules