diff --git a/metadata/proton.android.pass.fdroid.yml b/metadata/proton.android.pass.fdroid.yml
index 9df7db8f76..6d2e2c7691 100644
--- a/metadata/proton.android.pass.fdroid.yml
+++ b/metadata/proton.android.pass.fdroid.yml
@@ -17,51 +17,6 @@ RepoType: git
 Repo: https://github.com/protonpass/android-pass.git
 
 Builds:
-  - versionName: 1.20.3
-    versionCode: 12003000
-    disable: https://gitlab.com/fdroid/fdroiddata/-/merge_requests/14773#note_1856586599
-    commit: 586e6e1f9c0a8a7edab5a2da760ea39331ec2f8a
-    subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y make golang-go
-    gradle:
-      - fdroid
-      - prod
-    srclibs:
-      - proton-gomobile-build-tool@9375f8893b85718f717e0b465a156e27c491d1e9
-      - protoncore@e87ee6de512763d4b530d6097d3329ffb81ca6e8
-      - proton-pass-contents-proto-definition@1.1.2
-    prebuild:
-      - sed -i -e 's/+ jobId//' build.gradle.kts
-      - sed -i -e '/plugins {/,/^}/d' -e '/includeCoreBuild {/,/^}/d' ../settings.gradle.kts
-      - sed -i -e '/signingConfigs/d' -e '/signingConfig/,/}$/d' build.gradle.kts
-      - sed -i -e '/io.sentry.android.gradle/d' build.gradle.kts
-      - sed -i -e '/sentry {/,/^}/d' build.gradle.kts
-      - sed -i -e 's_System.getenv().containsKey("CI")_true_g' ../build.gradle.kts
-      - sed -i -e 's|../../proton-libs/gopenpgp/gopenpgp.aar|libs/gopenpgp.aar|' build.gradle.kts
-      - sed -i -e 's|../proton-libs/gopenpgp/gopenpgp.aar|app/libs/gopenpgp.aar|'
-        ../pass/{crypto,data}/impl/build.gradle.kts
-      - sed -i -E -e "/go_version/s/[0-9.]+/$(go version | sed -n -E 's/.*go([0-9.]+).*/\1/p')/"
-        $$protoncore$$/gopenpgp/build-config.json
-      - export PROTOBUF_TAG=$(sed -n -e 's/^val PROTOBUF_TAG = "\(.*\)".*/\1/p' ../settings.gradle.kts)
-      - pushd $$proton-pass-contents-proto-definition$$
-      - git checkout -f $PROTOBUF_TAG
-      - popd
-    scandelete:
-      - build-logic/module-generator/build
-    build:
-      - sdkmanager 'platforms;android-34'
-      - mkdir libs
-      - pushd $$proton-gomobile-build-tool$$
-      - make build cfg=$$protoncore$$/gopenpgp/build-config.json
-      - popd
-      - mv $$proton-gomobile-build-tool$$/out/android/gopenpgp.aar libs
-      - mv $$proton-pass-contents-proto-definition$$ ../pass/protos/contents-proto-definition
-    ndk: r23c
-    gradleprops:
-      - apkBuild=true
-
   - versionName: 1.20.4
     versionCode: 12004000
     commit: 32b9158d61d5d3c0e415a815dbbc77df4473b531
@@ -77,6 +32,8 @@ Builds:
       - protoncore@e87ee6de512763d4b530d6097d3329ffb81ca6e8
       - proton-pass-contents-proto-definition@1.1.2
     prebuild:
+      - echo -e "\norg.gradle.jvmargs=-Xms1g -Xmx5g -XX:+UseParallelGC -Dfile.encoding=UTF-8
+        -XX:MaxMetaspaceSize=1g" >> ../gradle.properties
       - sed -i -e 's/+ jobId//' build.gradle.kts
       - sed -i -e '/plugins {/,/^}/d' -e '/includeCoreBuild {/,/^}/d' ../settings.gradle.kts
       - sed -i -e '/signingConfigs/d' -e '/signingConfig/,/}$/d' build.gradle.kts