diff --git a/metadata/com.lesspass.android.yml b/metadata/com.lesspass.android.yml
index 1af7b18c4f..159d67b305 100644
--- a/metadata/com.lesspass.android.yml
+++ b/metadata/com.lesspass.android.yml
@@ -604,6 +604,186 @@ Builds:
     gradleprops:
       - reactNativeArchitectures=x86_64
 
+  - versionName: 9.8.6
+    versionCode: 900800601
+    commit: cfccf2e8d3b0a2594724eaba681039cccb013ada
+    subdir: packages/lesspass-mobile/android/app/
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288 || true
+      - apt-get update
+      - apt-get install -y make gcc libc-dev golang-go
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.gz
+      - echo "9d942932535988091034dc94cc5f42b6dc8784d6366df3a36c4c9ccb3996f0c2 node.tar.gz"
+        | sha256sum -c -
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - npm -g install yarn
+    gradle:
+      - yes
+    output: build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
+    srclibs:
+      - esbuild@v0.25.0
+    prebuild:
+      - sed -i 's/versionCode [0-9]\+/versionCode $$VERCODE$$/' build.gradle
+      - sed -i 's/versionName "[0-9]*\.[0-9]*\.[0-9]*"/versionName "$$VERSION$$"/'
+        build.gradle
+      - pushd ../../../..
+      - yarn install
+    scanignore:
+      - node_modules/@react-native-async-storage/async-storage/android/build.gradle
+      - node_modules/jsc-android/dist/org/webkit/android-jsc
+      - node_modules/react-native-safe-area-context/android/build.gradle
+      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+    scandelete:
+      - node_modules/
+      - .yarn/install-state.gz
+    build:
+      - pushd $$esbuild$$
+      - make esbuild
+      - popd
+      - pushd ../../../..
+      - mv $$esbuild$$/esbuild node_modules/@esbuild/linux-x64/bin/esbuild
+      - yarn build
+      - popd
+    gradleprops:
+      - reactNativeArchitectures=armeabi-v7a
+      - hermesEnabled=false
+
+  - versionName: 9.8.6
+    versionCode: 900800602
+    commit: cfccf2e8d3b0a2594724eaba681039cccb013ada
+    subdir: packages/lesspass-mobile/android/app/
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288 || true
+      - apt-get update
+      - apt-get install -y make gcc libc-dev golang-go
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.gz
+      - echo "9d942932535988091034dc94cc5f42b6dc8784d6366df3a36c4c9ccb3996f0c2 node.tar.gz"
+        | sha256sum -c -
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - npm -g install yarn
+    gradle:
+      - yes
+    output: build/outputs/apk/release/app-x86-release-unsigned.apk
+    srclibs:
+      - esbuild@v0.25.0
+    prebuild:
+      - sed -i 's/versionCode [0-9]\+/versionCode $$VERCODE$$/' build.gradle
+      - sed -i 's/versionName "[0-9]*\.[0-9]*\.[0-9]*"/versionName "$$VERSION$$"/'
+        build.gradle
+      - pushd ../../../..
+      - yarn install
+    scanignore:
+      - node_modules/@react-native-async-storage/async-storage/android/build.gradle
+      - node_modules/jsc-android/dist/org/webkit/android-jsc
+      - node_modules/react-native-safe-area-context/android/build.gradle
+      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+    scandelete:
+      - node_modules/
+      - .yarn/install-state.gz
+    build:
+      - pushd $$esbuild$$
+      - make esbuild
+      - popd
+      - pushd ../../../..
+      - mv $$esbuild$$/esbuild node_modules/@esbuild/linux-x64/bin/esbuild
+      - yarn build
+      - popd
+    gradleprops:
+      - reactNativeArchitectures=x86
+      - hermesEnabled=false
+
+  - versionName: 9.8.6
+    versionCode: 900800603
+    commit: cfccf2e8d3b0a2594724eaba681039cccb013ada
+    subdir: packages/lesspass-mobile/android/app/
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288 || true
+      - apt-get update
+      - apt-get install -y make gcc libc-dev golang-go
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.gz
+      - echo "9d942932535988091034dc94cc5f42b6dc8784d6366df3a36c4c9ccb3996f0c2 node.tar.gz"
+        | sha256sum -c -
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - npm -g install yarn
+    gradle:
+      - yes
+    output: build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk
+    srclibs:
+      - esbuild@v0.25.0
+    prebuild:
+      - sed -i 's/versionCode [0-9]\+/versionCode $$VERCODE$$/' build.gradle
+      - sed -i 's/versionName "[0-9]*\.[0-9]*\.[0-9]*"/versionName "$$VERSION$$"/'
+        build.gradle
+      - pushd ../../../..
+      - yarn install
+    scanignore:
+      - node_modules/@react-native-async-storage/async-storage/android/build.gradle
+      - node_modules/jsc-android/dist/org/webkit/android-jsc
+      - node_modules/react-native-safe-area-context/android/build.gradle
+      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+    scandelete:
+      - node_modules/
+      - .yarn/install-state.gz
+    build:
+      - pushd $$esbuild$$
+      - make esbuild
+      - popd
+      - pushd ../../../..
+      - mv $$esbuild$$/esbuild node_modules/@esbuild/linux-x64/bin/esbuild
+      - yarn build
+      - popd
+    gradleprops:
+      - reactNativeArchitectures=arm64-v8a
+      - hermesEnabled=false
+
+  - versionName: 9.8.6
+    versionCode: 900800604
+    commit: cfccf2e8d3b0a2594724eaba681039cccb013ada
+    subdir: packages/lesspass-mobile/android/app/
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288 || true
+      - apt-get update
+      - apt-get install -y make gcc libc-dev golang-go
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.gz
+      - echo "9d942932535988091034dc94cc5f42b6dc8784d6366df3a36c4c9ccb3996f0c2 node.tar.gz"
+        | sha256sum -c -
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - npm -g install yarn
+    gradle:
+      - yes
+    output: build/outputs/apk/release/app-x86_64-release-unsigned.apk
+    srclibs:
+      - esbuild@v0.25.0
+    prebuild:
+      - sed -i 's/versionCode [0-9]\+/versionCode $$VERCODE$$/' build.gradle
+      - sed -i 's/versionName "[0-9]*\.[0-9]*\.[0-9]*"/versionName "$$VERSION$$"/'
+        build.gradle
+      - pushd ../../../..
+      - yarn install
+    scanignore:
+      - node_modules/@react-native-async-storage/async-storage/android/build.gradle
+      - node_modules/jsc-android/dist/org/webkit/android-jsc
+      - node_modules/react-native-safe-area-context/android/build.gradle
+      - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native-vector-icons/android/build.gradle
+    scandelete:
+      - node_modules/
+      - .yarn/install-state.gz
+    build:
+      - pushd $$esbuild$$
+      - make esbuild
+      - popd
+      - pushd ../../../..
+      - mv $$esbuild$$/esbuild node_modules/@esbuild/linux-x64/bin/esbuild
+      - yarn build
+      - popd
+    gradleprops:
+      - reactNativeArchitectures=x86_64
+      - hermesEnabled=false
+
 MaintainerNotes: |-
   scanignore is used to allow the "node_modules/react-native/android" local Maven repository.
 
@@ -612,5 +792,5 @@ MaintainerNotes: |-
 ArchivePolicy: 4
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 9.8.5
-CurrentVersionCode: 900800504
+CurrentVersion: 9.8.6
+CurrentVersionCode: 900800604