diff --git a/metadata/io.github.lydavid.musicsearch.yml b/metadata/io.github.lydavid.musicsearch.yml
index ff6c179e57..e38638b8dd 100644
--- a/metadata/io.github.lydavid.musicsearch.yml
+++ b/metadata/io.github.lydavid.musicsearch.yml
@@ -768,8 +768,7 @@ Builds:
       - apt-get update
       - apt-get install -y openjdk-21-jdk-headless
       - update-java-alternatives -a
-    gradle:
-      - fDroid
+    output: build/outputs/apk/fDroid/release/*.apk
     prebuild:
       - cp -R ../../gradle ./
       - echo "TVVTSUNCUkFJTlpfQ0xJRU5UX0lEPWtpbVpiWXlaYUVia2Ewb0Npb1ExNUdINWhlNFp4dGtXCg=="
@@ -778,8 +777,20 @@ Builds:
         | base64 -d >> ../../not_so_secret.properties
       - sed -i -e '/firebase/d' -e '/google.services/d' ../../build.gradle.kts
       - sed -i -e 's/\.debug//' ../../shared/domain/src/commonMain/kotlin/ly/david/musicsearch/shared/domain/Constants.kt
+      - gradle clean
     scandelete:
       - build-logic/convention/build
+    build:
+      - mkdir upstream
+      - pushd upstream
+      - curl -L -o upstream.apk https://github.com/lydavid/MusicSearch/releases/download/v$$VERSION$$/app-fDroid-release.apk
+      - unzip -q upstream.apk
+      - export upstreamhash=$(sha256sum assets/dexopt/baseline.prof|cut -d " " -f1)
+      - popd
+      - for i in {1..10}; do taskset --cpu-list 0-6 gradle clean assembleFDroidRelease;
+        mkdir local; pushd local; unzip -q ../build/outputs/apk/fDroid/release/*.apk;
+        export localhash=$(sha256sum assets/dexopt/baseline.prof|cut -d " " -f1);
+        [[ $localhash == $upstreamhash ]] && break ; popd; rm -fr local; done
 
 AllowedAPKSigningKeys: c9b37762445dfcab7eabea79195d7f5c32501180f7c31403cf5cb427fd6810fc