diff --git a/metadata/player.phonograph.plus.yml b/metadata/player.phonograph.plus.yml
index b1c5bb003f..c9f023decc 100644
--- a/metadata/player.phonograph.plus.yml
+++ b/metadata/player.phonograph.plus.yml
@@ -689,16 +689,26 @@ Builds:
     commit: 773917ef8e12100bf4fc2e65a7d6a8832b1ac835
     subdir: app
     sudo:
-      - export CPUS_MAX=16
+      - export CPUS_MAX=6
       - export CPUS=$(getconf _NPROCESSORS_ONLN)
       - for (( c=$CPUS_MAX; c<$CPUS; c++ )) ; do echo 0 > /sys/devices/system/cpu/cpu$c/online
         ; done
-    gradle:
-      - modern
-      - stable
+    output: build/outputs/apk/modernStable/release/PhonographPlus-*-modern-stable-release-unsigned.apk
     binary: https://github.com/chr56/Phonograph_Plus/releases/download/v%v/PhonographPlus_%v_ModernStableRelease.apk
     srclibs:
-      - reproducible-apk-tools@v0.2.8
+      - reproducible-apk-tools@v0.3.0
+    prebuild: gradle clean
+    build:
+      - mkdir upstream
+      - pushd upstream
+      - curl -L -o upstream.apk https://github.com/chr56/Phonograph_Plus/releases/download/v$$VERSION$$/PhonographPlus_$$VERSION$$_ModernStableRelease.apk
+      - unzip -q upstream.apk
+      - export upstreamhash=$(sha256sum assets/dexopt/baseline.prof|cut -d " " -f1)
+      - popd
+      - for i in {1..10}; do gradle clean assembleModernStableRelease; mkdir local;
+        pushd local; unzip -q ../build/outputs/apk/modernStable/release/PhonographPlus-*-modern-stable-release-unsigned.apk;
+        export localhash=$(sha256sum assets/dexopt/baseline.prof|cut -d " " -f1);
+        [[ $localhash == $upstreamhash ]] && break ; popd; rm -fr local; done
     postbuild: $$reproducible-apk-tools$$/inplace-fix.py --page-size 16 fix-newlines
       "$$OUT$$" 'META-INF/services/*'