diff --git a/metadata/sushi.hardcore.droidfs.yml b/metadata/sushi.hardcore.droidfs.yml
index b7daa5d41a..d9cbda3c0d 100644
--- a/metadata/sushi.hardcore.droidfs.yml
+++ b/metadata/sushi.hardcore.droidfs.yml
@@ -520,39 +520,85 @@ Builds:
       - nosplits
 
   - versionName: 2.2.0
-    versionCode: 37
-    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/15456
-    commit: a62f32e364277268a37d556bd3907d30b7b86a0d
+    versionCode: 372
+    commit: 0a1406769ba7eb14b8a09f58b68be2bf83a36c84
     subdir: app
-    submodules: true
     sudo:
       - apt-get update
-      - apt-get install -y golang-go/bullseye-backports golang-src/bullseye-backports
-        openjdk-17-jdk-headless build-essential pkg-config libssl-dev wget
+      - apt-get install -y golang-go golang-src build-essential pkg-config libssl-dev
+        npm wget
     gradle:
       - yes
-    srclibs:
-      - OpenSSL@OpenSSL_1_1_1v
-      - FFmpeg@n6.0
-    prebuild:
-      - cd ../libpdfviewer && mkdir app/pdfjs-dist pdfjs && cd pdfjs
-      - wget https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.8.162.tgz
-      - tar xf pdfjs-dist-3.8.162.tgz package/build/pdf.min.js package/build/pdf.worker.min.js
-      - mv package/build ../app/pdfjs-dist
-      - cd .. && rm -rf pdfjs
+    prebuild: for dir in . libgocryptfs libcryfs; do git -C "$dir" submodule update
+      --init; done
     scandelete:
+      - app/libgocryptfs/openssl/test
       - app/libcryfs/vendor/cryptopp/vendor_cryptopp/TestData
       - app/libcryfs/vendor/cryptopp/vendor_cryptopp/*.zip
     build:
       - cd libgocryptfs
-      - OPENSSL_PATH="$$OpenSSL$$" ./build.sh
+      - ./build.sh x86_64
       - cd ../ffmpeg
-      - ./build.sh $$FFmpeg$$
+      - ./build.sh x86_64
     ndk: r25c
     gradleprops:
-      - nosplits
+      - abi=x86_64
+
+  - versionName: 2.2.0
+    versionCode: 373
+    commit: 0a1406769ba7eb14b8a09f58b68be2bf83a36c84
+    subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y golang-go golang-src build-essential pkg-config libssl-dev
+        npm wget
+    gradle:
+      - yes
+    prebuild: for dir in . libgocryptfs libcryfs; do git -C "$dir" submodule update
+      --init; done
+    scandelete:
+      - app/libgocryptfs/openssl/test
+      - app/libcryfs/vendor/cryptopp/vendor_cryptopp/TestData
+      - app/libcryfs/vendor/cryptopp/vendor_cryptopp/*.zip
+    build:
+      - cd libgocryptfs
+      - ./build.sh armeabi-v7a
+      - cd ../ffmpeg
+      - ./build.sh armeabi-v7a
+    ndk: r25c
+    gradleprops:
+      - abi=armeabi-v7a
+
+  - versionName: 2.2.0
+    versionCode: 374
+    commit: 0a1406769ba7eb14b8a09f58b68be2bf83a36c84
+    subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y golang-go golang-src build-essential pkg-config libssl-dev
+        npm wget
+    gradle:
+      - yes
+    prebuild: for dir in . libgocryptfs libcryfs; do git -C "$dir" submodule update
+      --init; done
+    scandelete:
+      - app/libgocryptfs/openssl/test
+      - app/libcryfs/vendor/cryptopp/vendor_cryptopp/TestData
+      - app/libcryfs/vendor/cryptopp/vendor_cryptopp/*.zip
+    build:
+      - cd libgocryptfs
+      - ./build.sh arm64-v8a
+      - cd ../ffmpeg
+      - ./build.sh arm64-v8a
+    ndk: r25c
+    gradleprops:
+      - abi=arm64-v8a
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[\d.]+$
+VercodeOperation:
+  - 10 * %c + 2
+  - 10 * %c + 3
+  - 10 * %c + 4
 CurrentVersion: 2.2.0
-CurrentVersionCode: 37
+CurrentVersionCode: 374