diff --git a/metadata/com.geeksville.mesh.yml b/metadata/com.geeksville.mesh.yml
index f5a7532d77..2a752044d1 100644
--- a/metadata/com.geeksville.mesh.yml
+++ b/metadata/com.geeksville.mesh.yml
@@ -437,10 +437,32 @@ Builds:
         break; sha256sum apk/assets/dexopt/baseline.prof; rm -fr apk; taskset 0-3
         gradle clean assembleFdroidRelease; done
 
+  - versionName: 2.6.22
+    versionCode: 30622
+    commit: 15ba57bb3acd47b98baa52df89169801efceebef
+    subdir: app
+    submodules: true
+    sudo:
+      - echo "deb http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y openjdk-21-jdk-headless
+      - update-java-alternatives -a
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/USE_CRASHLYTICS)/,+4d' build.gradle.kts ../build.gradle.kts
+    postbuild:
+      - curl -Lo upstream.apk https://github.com/meshtastic/Meshtastic-Android/releases/download/$$VERSION$$/fdroidRelease-$$VERSION$$.apk
+      - unzip -q upstream.apk -d apk
+      - export hash=$(sha256sum apk/assets/dexopt/baseline.prof)
+      - rm -rf apk upstream.apk
+      - for i in {1..10}; do unzip -q $$OUT$$ -d apk; sha256sum -c - <<< $hash &&
+        break; sha256sum apk/assets/dexopt/baseline.prof; rm -fr apk; taskset 0-3
+        gradle clean assembleFdroidRelease; done
+
 AllowedAPKSigningKeys: a93b456568c175db0800a09f06777f892d812432adb8a3df73bc3e7f06c80c6d
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 UpdateCheckData: buildSrc/src/main/kotlin/Configs.kt|VERSION_CODE\s=\s(\d+)|.|VERSION_NAME\s=\s"(.*)"
-CurrentVersion: 2.6.20
-CurrentVersionCode: 30620
+CurrentVersion: 2.6.22
+CurrentVersionCode: 30622