diff --git a/metadata/sushi.hardcore.droidfs.yml b/metadata/sushi.hardcore.droidfs.yml
index f81e5bd8b9..67baefb4b2 100644
--- a/metadata/sushi.hardcore.droidfs.yml
+++ b/metadata/sushi.hardcore.droidfs.yml
@@ -343,22 +343,26 @@ Builds:
     submodules: true
     sudo:
       - apt-get update
-      - curl -Lso go.tar.gz https://golang.org/dl/go1.17.3.linux-amd64.tar.gz
-      - echo "550f9845451c0c94be679faf116291e7807a8d78b43149f9506c1b15eb89008c go.tar.gz"
-        | sha256sum -c -
-      - tar xzf go.tar.gz --strip-components=1 -C /usr/local/
+      - apt-get install -y golang-go/bullseye-backports golang-src/bullseye-backports
+        build-essential pkg-config libssl-dev wget
     gradle:
       - yes
     srclibs:
-      - OpenSSL@OpenSSL_1_1_1l
-      - FFmpeg@n4.4
-    prebuild: touch fdroid
+      - OpenSSL@OpenSSL_1_1_1t
+      - FFmpeg@n6.0
+    prebuild: sed -i ':a;N;$!ba;s/maven {\n *url = uri("https:\/\/dl.google.com\/dl\/android\/maven2")\n
+        *}/google()/g' ../libpdfviewer/build.gradle.kts
+    scandelete:
+      - app/libcryfs/vendor/cryptopp/vendor_cryptopp/TestData
+      - app/libcryfs/vendor/cryptopp/vendor_cryptopp/*.zip
     build:
       - cd libgocryptfs
       - OPENSSL_PATH="$$OpenSSL$$" ./build.sh
       - cd ../ffmpeg
       - ./build.sh $$FFmpeg$$
-    ndk: r23b
+    ndk: r25b
+    gradleprops:
+      - nosplits
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[\d.]+$