diff --git a/metadata/io.heckel.ntfy.yml b/metadata/io.heckel.ntfy.yml
index 4c07f8268c..7c83da2b64 100644
--- a/metadata/io.heckel.ntfy.yml
+++ b/metadata/io.heckel.ntfy.yml
@@ -196,9 +196,9 @@ Builds:
     subdir: app
     gradle:
       - fdroid
-    prebuild: sed -i -e '/google-services/d' build.gradle
+    prebuild: sed -i -e '/google-services/d' -e '/googleTask/d' build.gradle
 
-AutoUpdateMode: Version v%v
-UpdateCheckMode: Tags v\d+\.\d+\.\d+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags v[\d.]+
 CurrentVersion: 1.15.2
 CurrentVersionCode: 31
diff --git a/metadata/org.joinmastodon.android.yml b/metadata/org.joinmastodon.android.yml
index 23be3b5697..ca4f9c25cc 100644
--- a/metadata/org.joinmastodon.android.yml
+++ b/metadata/org.joinmastodon.android.yml
@@ -15,7 +15,7 @@ AutoName: Mastodon
 
 RepoType: git
 Repo: https://github.com/mastodon/mastodon-android.git
-Binaries: https://github.com/mastodon/mastodon-android/releases/download/v%v/mastodon-release.apk
+Binaries: https://github.com/mastodon/mastodon-android/releases/download/v%v/mastodon-githubRelease.apk
 
 Builds:
   - versionName: 1.1.3
@@ -31,13 +31,15 @@ Builds:
 
   - versionName: 1.1.4
     versionCode: 45
+    disable: not reproducible due to png optimization
     commit: e10faeefc4201861e44b10fe8e071597d11ddc6a
     subdir: mastodon
     sudo:
       - apt-get update
       - apt-get install -y openjdk-17-jdk-headless
-    gradle:
-      - yes
+      - update-alternatives --auto java
+    output: build/outputs/apk/githubRelease/*.apk
+    build: gradle assembleGithubRelease
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags