diff --git a/metadata/com.streetwriters.notesnook.yml b/metadata/com.streetwriters.notesnook.yml
index 60b73fd3c2..94907049b3 100644
--- a/metadata/com.streetwriters.notesnook.yml
+++ b/metadata/com.streetwriters.notesnook.yml
@@ -11713,25 +11713,26 @@ Builds:
       - reactNativeArchitectures=x86_64
       - fdroidBuild=true
 
-  - versionName: 3.3.8
-    versionCode: 15386
-    disable: crash
-    commit: 4a3b3a14eca778d64dd05d37ff7ba889fd087701
+  - versionName: 3.3.9
+    versionCode: 15391
+    commit: 6343212d7e92c044119c262260c441894a7348ec
     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 --no-install-recommends g++ build-essential
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
       - 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/
-      - npm install -g yarn
+      - apt-get install -y g++ make libc-dev
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
       - npm run bootstrap -- --scope=mobile
-      - npm run tx  @notesnook/mobile:build
+      - npm run tx @notesnook/mobile:build
     gradle:
       - yes
     rm:
@@ -11747,6 +11748,8 @@ Builds:
       - 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
       - rm -rf ../../../.nx/cache/*-logs.tar.gz
+      - sed -i -e "s/project(':lazysodium-android')/'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
@@ -11755,7 +11758,6 @@ Builds:
       - 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
@@ -11786,20 +11788,21 @@ Builds:
       - reactNativeArchitectures=armeabi-v7a
       - fdroidBuild=true
 
-  - versionName: 3.3.8
-    versionCode: 15387
-    disable: crash
-    commit: 4a3b3a14eca778d64dd05d37ff7ba889fd087701
+  - versionName: 3.3.9
+    versionCode: 15392
+    commit: 6343212d7e92c044119c262260c441894a7348ec
     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 --no-install-recommends g++ build-essential
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
       - 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/
-      - npm install -g yarn
+      - apt-get install -y g++ make libc-dev
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
@@ -11820,12 +11823,13 @@ Builds:
       - 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
       - rm -rf ../../../.nx/cache/*-logs.tar.gz
+      - sed -i -e "s/project(':lazysodium-android')/'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
@@ -11859,20 +11863,21 @@ Builds:
       - reactNativeArchitectures=x86
       - fdroidBuild=true
 
-  - versionName: 3.3.8
-    versionCode: 15388
-    disable: crash
-    commit: 4a3b3a14eca778d64dd05d37ff7ba889fd087701
+  - versionName: 3.3.9
+    versionCode: 15393
+    commit: 6343212d7e92c044119c262260c441894a7348ec
     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 --no-install-recommends g++ build-essential
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
       - 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/
-      - npm install -g yarn
+      - apt-get install -y g++ make libc-dev
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
@@ -11893,6 +11898,8 @@ Builds:
       - 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
       - rm -rf ../../../.nx/cache/*-logs.tar.gz
+      - sed -i -e "s/project(':lazysodium-android')/'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
@@ -11900,7 +11907,6 @@ 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
@@ -11932,20 +11938,21 @@ Builds:
       - reactNativeArchitectures=arm64-v8a
       - fdroidBuild=true
 
-  - versionName: 3.3.8
-    versionCode: 15389
-    disable: crash
-    commit: 4a3b3a14eca778d64dd05d37ff7ba889fd087701
+  - versionName: 3.3.9
+    versionCode: 15394
+    commit: 6343212d7e92c044119c262260c441894a7348ec
     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 --no-install-recommends g++ build-essential
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
       - 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/
-      - npm install -g yarn
+      - apt-get install -y g++ make libc-dev
     init:
       - cd ../../../../..
       - npm ci --ignore-scripts --prefer-offline --no-audit
@@ -11966,13 +11973,14 @@ Builds:
       - 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
       - rm -rf ../../../.nx/cache/*-logs.tar.gz
+      - sed -i -e "s/project(':lazysodium-android')/'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
@@ -12013,5 +12021,5 @@ VercodeOperation:
   - '%c * 5 + 3'
   - '%c * 5 + 4'
 UpdateCheckData: apps/mobile/native/android/app/build.gradle|versionCode\s(\d+)|apps/mobile/package.json|"version":.*\"(.*)\",
-CurrentVersion: 3.3.8
-CurrentVersionCode: 15389
+CurrentVersion: 3.3.9
+CurrentVersionCode: 15394