diff --git a/metadata/de.mathema.privacyblur.yml b/metadata/de.mathema.privacyblur.yml
index 3d21c78a63..d5ab1b1647 100644
--- a/metadata/de.mathema.privacyblur.yml
+++ b/metadata/de.mathema.privacyblur.yml
@@ -60,14 +60,14 @@ Builds:
       - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-foss-release.apk
     srclibs:
-      - flutter@2.5.2
+      - flutter@2.8.1
     rm:
       - ios
     prebuild: echo "flutter.sdk=$$flutter$$" >> ../local.properties
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter packages pub get
-      - $$flutter$$/bin/flutter build apk --flavor foss -t lib/main-foss.dart
+      - $$flutter$$/bin/flutter build apk --flavor foss -t lib/main_foss.dart
 
 AutoUpdateMode: Version +-foss v%v
 UpdateCheckMode: Tags
diff --git a/metadata/me.blog.korn123.easydiary.yml b/metadata/me.blog.korn123.easydiary.yml
index 99de4caaf6..3e52966681 100644
--- a/metadata/me.blog.korn123.easydiary.yml
+++ b/metadata/me.blog.korn123.easydiary.yml
@@ -8,19 +8,6 @@ SourceCode: https://github.com/hanjoongcho/aaf-easydiary
 IssueTracker: https://github.com/hanjoongcho/aaf-easydiary/issues
 
 AutoName: Easy Diary
-Description: |-
-    Features:
-
-    * Writing diary (voice & keypad)
-    * Diary search
-    * View & List Diary
-    * Edit your diary
-    * Diary backup and recovery
-    * View timetable diary creation status chart
-    * View a list of diaries in your calendar
-    * Lock diary
-    * Attach Photos
-    * Font Setting
 
 RepoType: git
 Repo: https://github.com/hanjoongcho/aaf-easydiary
@@ -507,6 +494,10 @@ Builds:
     versionCode: 258
     commit: 02ee73d4bd4cb23ce6c6c75937c34062fa934b85
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - foss
 
diff --git a/metadata/name.seguri.android.lock.yml b/metadata/name.seguri.android.lock.yml
index 7563c64722..6e329a661e 100644
--- a/metadata/name.seguri.android.lock.yml
+++ b/metadata/name.seguri.android.lock.yml
@@ -72,6 +72,10 @@ Builds:
     versionCode: 12
     commit: b0791a2d0a3997fe501b236deb3c303141ba2c0e
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/org.metabrainz.android.yml b/metadata/org.metabrainz.android.yml
index 284c3f0722..df868ddc34 100644
--- a/metadata/org.metabrainz.android.yml
+++ b/metadata/org.metabrainz.android.yml
@@ -70,6 +70,7 @@ Builds:
       - update-alternatives --auto java
     gradle:
       - yes
+    prebuild: sed -i -e '/gms/d' build.gradle -e '/dist:instant/d' src/main/AndroidManifest.xml
     ndk: r21c
 
 AutoUpdateMode: Version
diff --git a/metadata/se.manyver.yml b/metadata/se.manyver.yml
index ad824518d6..b1f72fdcb4 100644
--- a/metadata/se.manyver.yml
+++ b/metadata/se.manyver.yml
@@ -1951,6 +1951,7 @@ Builds:
       - node_modules/react-native/template/
       - desktop
       - ios
+      - test
     prebuild: sed -i -e '/lifecycle/d' ../build.gradle
     scanignore:
       - android/build.gradle