diff --git a/metadata/com.sanzoghenzo.markdownr.yml b/metadata/com.sanzoghenzo.markdownr.yml
index b5258fe1b3..92985eb072 100644
--- a/metadata/com.sanzoghenzo.markdownr.yml
+++ b/metadata/com.sanzoghenzo.markdownr.yml
@@ -64,7 +64,7 @@ Builds:
       - update-alternatives --auto java
     output: build/app/outputs/flutter-apk/app-release.apk
     srclibs:
-      - flutter@2.10.4
+      - flutter@3.0.5
     build:
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter build apk --release --verbose
diff --git a/metadata/info.dvkr.screenstream.yml b/metadata/info.dvkr.screenstream.yml
index 412e6c5d15..a4abaef94d 100644
--- a/metadata/info.dvkr.screenstream.yml
+++ b/metadata/info.dvkr.screenstream.yml
@@ -1003,6 +1003,7 @@ Builds:
 
   - versionName: 3.9.0
     versionCode: 30900
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 9e4a8960c0e4039c9cb1c9e798632fda739fe946
     subdir: app
     sudo:
@@ -1032,6 +1033,7 @@ Builds:
 
   - versionName: 3.9.2
     versionCode: 30902
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 3e948260d748b7a0e96c8a17ac7a77b878ef3e52
     subdir: app
     sudo:
@@ -1061,6 +1063,7 @@ Builds:
 
   - versionName: 3.9.3
     versionCode: 30903
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004
     commit: 73b1cbe44743bfe1be182704711c5ed5406d8978
     subdir: app
     sudo:
@@ -1094,7 +1097,7 @@ Builds:
     subdir: app
     sudo:
       - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk
+      - apt-get install -y openjdk-11-jdk-headless
       - update-alternatives --auto java
     gradle:
       - firebasefree
@@ -1104,10 +1107,10 @@ Builds:
       - app/libs/bottomsheets-release.aar
     prebuild:
       - sed -i -e 's|= uri("https://jitpack\.io")|"https://jitpack.io"|' ../build.gradle
-      - sed -i -e '/com\.google\.firebase/d; /com\.google\.gms/d' ../build.gradle
-        build.gradle
+      - sed -i -e '/google.firebase/d; /gms/d' ../build.gradle build.gradle
       - sed -i -e '/firebaseCrashlytics/d' -e '/^android\.applicationVariants\.all
         {/,/^}$/d' build.gradle
+      - sed -i -e '/app-update-ktx/s/implementation/firebaseImplementation/' build.gradle
       - pushd $$Material-Dialogs$$
       - sed -i -e '241d' bottomsheets/src/main/java/com/afollestad/materialdialogs/bottomsheets/BottomSheet.kt
     build:
@@ -1117,7 +1120,7 @@ Builds:
       - cp $$Material-Dialogs$$/bottomsheets/build/outputs/aar/bottomsheets-release.aar
         libs/
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 3.9.5
 CurrentVersionCode: 30905