diff --git a/metadata/de.jbservices.nc_passwords_app.yml b/metadata/de.jbservices.nc_passwords_app.yml
index eed34c8382..be255ccc98 100644
--- a/metadata/de.jbservices.nc_passwords_app.yml
+++ b/metadata/de.jbservices.nc_passwords_app.yml
@@ -134,23 +134,39 @@ Builds:
 
   - versionName: 23.2.2
     versionCode: 24
-    disable: https://gitlab.com/joleaf/nc-passwords-app/-/issues/94
     commit: 4fc4b07d347e2f8a7ea14396cb2612be01546cd2
+    sudo:
+      - apt-get update
+      - apt-get install -y automake libtool make
     output: build/app/outputs/flutter-apk/app-fdroid-release.apk
     srclibs:
-      - flutter@2.10.5
+      - flutter@3.7.0
+      - libsodium@ee009287afd480b60a9a4d75b19afdc0f705e9d9
     rm:
       - ios
     prebuild:
       - sed -i -e '/signingConfigs.debug/,+1d' -e '/std {}/d' android/app/build.gradle
       - export PUB_CACHE=$(pwd)/.pub-cache
+      - $$flutter$$/bin/flutter precache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
     scandelete:
       - .pub-cache
     build:
       - export PUB_CACHE=$(pwd)/.pub-cache
+      - pushd $$libsodium$$
+      - ./autogen.sh -s
+      - ./dist-build/android-armv7-a.sh
+      - ./dist-build/android-armv8-a.sh
+      - ./dist-build/android-x86.sh
+      - ./dist-build/android-x86_64.sh
+      - popd
+      - cp $$libsodium$$/libsodium-android-armv7-a/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/armeabi-v7a/
+      - cp $$libsodium$$/libsodium-android-westmere/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/x86_64/
+      - cp $$libsodium$$/libsodium-android-armv8-a+crypto/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/arm64-v8a/
+      - cp $$libsodium$$/libsodium-android-i686/lib/libsodium.so $PUB_CACHE/hosted/pub.dev/flutter_sodium-0.2.0/android/src/main/jniLibs/x86/
       - $$flutter$$/bin/flutter build apk --flavor fdroid
+    ndk: r25b
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v.*$