diff --git a/metadata/com.standardnotes.yml b/metadata/com.standardnotes.yml
index 6615550796..de8dfb37eb 100644
--- a/metadata/com.standardnotes.yml
+++ b/metadata/com.standardnotes.yml
@@ -2045,13 +2045,11 @@ Builds:
       - popd
     ndk: r21e
 
-  - versionName: 3.9.5
+  - versionName: 3.9.6
     versionCode: 3000313
-    disable: https://github.com/standardnotes/mobile/issues/516
-    commit: 3.9.5
+    commit: 3.9.6
     subdir: android/app/
     sudo:
-      - sysctl fs.inotify.max_user_watches=524288
       - curl -Lo node.tar.gz https://nodejs.org/download/release/v14.18.2/node-v14.18.2-linux-x64.tar.gz
       - echo "83fa18a0e3642235446b66653eb27c169224ae9c1a15a32d6c3d9ddefb154ed4 node.tar.gz"
         | sha256sum -c -
@@ -2072,8 +2070,19 @@ Builds:
     rm:
       - .gitmodules
     prebuild:
-      - $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404' > /dev/null
+      - wget -O /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip"
+      - echo "124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf /tmp/cmdline-tools.zip"  |
+        sha256sum -c -
+      - unzip -q -o /tmp/cmdline-tools.zip -d /tmp/cmdline-tools
+      - rm /tmp/cmdline-tools.zip
+      - mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/tools
+      - mv /tmp/cmdline-tools/cmdline-tools/* ${ANDROID_SDK_ROOT}/cmdline-tools/tools
+        || true
+      - export PATH=${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin:${PATH}
+      - yes | sdkmanager --licenses
+      - sdkmanager 'cmake;3.10.2.4988404' > /dev/null
       - sed -i -e '/detox/d' -e '/DETOX_CI/d' build.gradle
+      - echo "android { splits { abi { enable false } } }" >> build.gradle
       - sed -i -e "s/versionName appVersionName/versionName \"$$VERSION$$\"/" -e "s/versionCode
         appVersionCode/versionCode $$VERCODE$$/" build.gradle
       - sed -i -e "/appVersionName/d" -e "/appVersionCode/d" build.gradle
@@ -2089,6 +2098,7 @@ Builds:
       - node_modules/standard-notes-rn/android/build.gradle
       - node_modules/@react-native-community/async-storage/android/build.gradle
       - node_modules/@react-native-community/masked-view/android/build.gradle
+      - node_modules/@react-native-community/netinfo/android/build.gradle
     scandelete:
       - node_modules/
     build:
@@ -2107,5 +2117,5 @@ AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
 VercodeOperation: 3000220 + %c
 UpdateCheckData: https://github.com/standardnotes/mobile/actions/workflows/build-prod.yml|(\d+)\sworkflow\sruns|https://github.com/standardnotes/mobile/releases/latest|tree/([\d.]+)
-CurrentVersion: 3.9.5
+CurrentVersion: 3.9.6
 CurrentVersionCode: 3000313