diff --git a/metadata/com.streetwriters.notesnook.yml b/metadata/com.streetwriters.notesnook.yml
index f202ff3d19..5678fe6c3e 100644
--- a/metadata/com.streetwriters.notesnook.yml
+++ b/metadata/com.streetwriters.notesnook.yml
@@ -903,8 +903,7 @@ Builds:
 
   - versionName: 2.5.4
     versionCode: 10266
-    disable: npm package 404
-    commit: d3c47d33218a61fd094315b03654fd7d899e9032
+    commit: 194556a0a121fc899812d04926627f46f7843eaa
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
@@ -927,7 +926,6 @@ Builds:
       - apps/web
       - packages/clipper
     prebuild:
-      - sed -i -e '/cliPath/s|"../../..|"../..|' build.gradle
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
       - cd ../../
@@ -935,18 +933,16 @@ 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
     scanignore:
-      - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/react-native/*
       - apps/mobile/node_modules/jsc-android
       - apps/mobile/node_modules/hermes-engine
-      - apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
       - apps/mobile/node_modules/@callstack/repack/android/build.gradle
+      - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
       - apps/mobile/node_modules/react-native-screens/android/build.gradle
       - apps/mobile/node_modules/react-native-safe-area-context/android/build.gradle
       - apps/mobile/node_modules/react-native-svg/android/build.gradle
       - apps/mobile/node_modules/react-native-document-picker/android/build.gradle
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
-      - apps/mobile/node_modules/react-native-notification-sounds/android/build.gradle
       - apps/mobile/node_modules/react-native-gzip/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
@@ -970,7 +966,7 @@ Builds:
     build:
       - rm -rf ../../../node_modules/react-native-mmkv-storage/android/react-native*
       - gradle clean
-    ndk: r21e
+    ndk: 23.1.7779620
     gradleprops:
       - buildUniversalApk=false
       - reactNativeArchitectures=armeabi-v7a
@@ -978,8 +974,7 @@ Builds:
 
   - versionName: 2.5.4
     versionCode: 10267
-    disable: npm package 404
-    commit: d3c47d33218a61fd094315b03654fd7d899e9032
+    commit: 194556a0a121fc899812d04926627f46f7843eaa
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
@@ -1002,7 +997,6 @@ Builds:
       - apps/web
       - packages/clipper
     prebuild:
-      - sed -i -e '/cliPath/s|"../../..|"../..|' build.gradle
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
       - cd ../../
@@ -1010,18 +1004,16 @@ 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
     scanignore:
-      - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/react-native/*
       - apps/mobile/node_modules/jsc-android
       - apps/mobile/node_modules/hermes-engine
-      - apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
       - apps/mobile/node_modules/@callstack/repack/android/build.gradle
+      - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
       - apps/mobile/node_modules/react-native-screens/android/build.gradle
       - apps/mobile/node_modules/react-native-safe-area-context/android/build.gradle
       - apps/mobile/node_modules/react-native-svg/android/build.gradle
       - apps/mobile/node_modules/react-native-document-picker/android/build.gradle
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
-      - apps/mobile/node_modules/react-native-notification-sounds/android/build.gradle
       - apps/mobile/node_modules/react-native-gzip/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
@@ -1045,7 +1037,7 @@ Builds:
     build:
       - rm -rf ../../../node_modules/react-native-mmkv-storage/android/react-native*
       - gradle clean
-    ndk: r21e
+    ndk: 23.1.7779620
     gradleprops:
       - buildUniversalApk=false
       - reactNativeArchitectures=x86
@@ -1053,8 +1045,7 @@ Builds:
 
   - versionName: 2.5.4
     versionCode: 10268
-    disable: npm package 404
-    commit: d3c47d33218a61fd094315b03654fd7d899e9032
+    commit: 194556a0a121fc899812d04926627f46f7843eaa
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
@@ -1077,7 +1068,6 @@ Builds:
       - apps/web
       - packages/clipper
     prebuild:
-      - sed -i -e '/cliPath/s|"../../..|"../..|' build.gradle
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
       - cd ../../
@@ -1085,18 +1075,16 @@ 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
     scanignore:
-      - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/react-native/*
       - apps/mobile/node_modules/jsc-android
       - apps/mobile/node_modules/hermes-engine
-      - apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
       - apps/mobile/node_modules/@callstack/repack/android/build.gradle
+      - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
       - apps/mobile/node_modules/react-native-screens/android/build.gradle
       - apps/mobile/node_modules/react-native-safe-area-context/android/build.gradle
       - apps/mobile/node_modules/react-native-svg/android/build.gradle
       - apps/mobile/node_modules/react-native-document-picker/android/build.gradle
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
-      - apps/mobile/node_modules/react-native-notification-sounds/android/build.gradle
       - apps/mobile/node_modules/react-native-gzip/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
@@ -1120,7 +1108,7 @@ Builds:
     build:
       - rm -rf ../../../node_modules/react-native-mmkv-storage/android/react-native*
       - gradle clean
-    ndk: r21e
+    ndk: 23.1.7779620
     gradleprops:
       - buildUniversalApk=false
       - reactNativeArchitectures=arm64-v8a
@@ -1128,8 +1116,7 @@ Builds:
 
   - versionName: 2.5.4
     versionCode: 10269
-    disable: npm package 404
-    commit: d3c47d33218a61fd094315b03654fd7d899e9032
+    commit: 194556a0a121fc899812d04926627f46f7843eaa
     subdir: apps/mobile/native/android/app
     sudo:
       - sysctl fs.inotify.max_user_watches=524288 || true
@@ -1152,7 +1139,6 @@ Builds:
       - apps/web
       - packages/clipper
     prebuild:
-      - sed -i -e '/cliPath/s|"../../..|"../..|' build.gradle
       - sed -i -e 's|<uses-permission android:name="com.android.vending.BILLING" />||g'
         ./src/main/AndroidManifest.xml
       - cd ../../
@@ -1160,18 +1146,16 @@ 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
     scanignore:
-      - apps/mobile/native/android/build.gradle
       - apps/mobile/node_modules/react-native/*
       - apps/mobile/node_modules/jsc-android
       - apps/mobile/node_modules/hermes-engine
-      - apps/mobile/node_modules/react-native-mmkv-storage/android/build.gradle
       - apps/mobile/node_modules/@callstack/repack/android/build.gradle
+      - apps/mobile/node_modules/@sayem314/react-native-keep-awake/android/build.gradle
       - apps/mobile/node_modules/react-native-screens/android/build.gradle
       - apps/mobile/node_modules/react-native-safe-area-context/android/build.gradle
       - apps/mobile/node_modules/react-native-svg/android/build.gradle
       - apps/mobile/node_modules/react-native-document-picker/android/build.gradle
       - apps/mobile/node_modules/react-native-actions-shortcuts/android/build.gradle
-      - apps/mobile/node_modules/react-native-notification-sounds/android/build.gradle
       - apps/mobile/node_modules/react-native-gzip/android/build.gradle
       - apps/mobile/node_modules/@ammarahmed/react-native-share-extension/android/build.gradle
       - apps/mobile/node_modules/react-native-webview/android/build.gradle
@@ -1195,7 +1179,7 @@ Builds:
     build:
       - rm -rf ../../../node_modules/react-native-mmkv-storage/android/react-native*
       - gradle clean
-    ndk: r21e
+    ndk: 23.1.7779620
     gradleprops:
       - buildUniversalApk=false
       - reactNativeArchitectures=x86_64