diff --git a/metadata/com.aefyr.sai.fdroid.yml b/metadata/com.aefyr.sai.fdroid.yml
index d8f1ef6eef..60cd0e42bd 100644
--- a/metadata/com.aefyr.sai.fdroid.yml
+++ b/metadata/com.aefyr.sai.fdroid.yml
@@ -246,7 +246,7 @@ Builds:
       - aefyr-android-filepicker@f145f0c896400ddf7cfc3439d4a9291d8cc4ade1
     rm:
       - app/libs/filepicker-release.aar
-    prebuild: sed -i -e '/io.fabric/d' -e '/google-services/d' -e '/maven {$/,+2d'
+    prebuild: sed -i -e '/io.fabric/d' -e '/google-services/d' -e '/maven {$/,+6d'
         build.gradle ../build.gradle
     build:
       - pushd $$aefyr-android-filepicker$$
diff --git a/metadata/com.blockbasti.justanotherworkouttimer.yml b/metadata/com.blockbasti.justanotherworkouttimer.yml
index fa0dfb4039..3ccf306732 100644
--- a/metadata/com.blockbasti.justanotherworkouttimer.yml
+++ b/metadata/com.blockbasti.justanotherworkouttimer.yml
@@ -40,7 +40,7 @@ Builds:
 
   - versionName: 1.1.1
     versionCode: 20210128
-    commit: v1.1.1
+    commit: 5d7b536f670581f5b2aa58e76154ed858779f0bc
     output: build/app/outputs/apk/release/app-release-unsigned.apk
     srclibs:
       - flutter@1.22.5
diff --git a/metadata/com.cg.lrceditor.yml b/metadata/com.cg.lrceditor.yml
index 171091503b..3bbaeed514 100644
--- a/metadata/com.cg.lrceditor.yml
+++ b/metadata/com.cg.lrceditor.yml
@@ -35,7 +35,7 @@ Builds:
 
   - versionName: 3.2.6
     versionCode: 55
-    commit: v3.2.6
+    commit: v3.2.6-b
     subdir: app
     gradle:
       - fdroid
diff --git a/metadata/com.etesync.notes.yml b/metadata/com.etesync.notes.yml
index 57c24c2b9a..07d2d547df 100644
--- a/metadata/com.etesync.notes.yml
+++ b/metadata/com.etesync.notes.yml
@@ -322,7 +322,6 @@ Builds:
       - android/build.gradle
       - node_modules/jsc-android
       - node_modules/react-native/android/com/facebook/react/react-native/*/
-      - node_modules/react-native-appearance/android/build.gradle
       - node_modules/react-native-reanimated/android/build.gradle
       - node_modules/react-native-safe-area-context/android/build.gradle
       - node_modules/react-native-screens/android/build.gradle
diff --git a/metadata/com.greenaddress.greenbits_android_wallet.yml b/metadata/com.greenaddress.greenbits_android_wallet.yml
index e674b6d817..13dec7df7c 100644
--- a/metadata/com.greenaddress.greenbits_android_wallet.yml
+++ b/metadata/com.greenaddress.greenbits_android_wallet.yml
@@ -1878,29 +1878,6 @@ Builds:
       - find src/main/jniLibs -type f -name "libgreenaddress.a" -exec rm -f {} \;
     ndk: r19c
 
-  - versionName: 3.4.8
-    versionCode: 348
-    commit: release_3.4.8
-    timeout: 25200
-    subdir: app
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y build-essential clang virtualenv
-    gradle:
-      - production
-    forcevercode: true
-    prebuild: sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle
-    scanignore:
-      - bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts
-      - bitcoinj/core/src/test
-      - app/src/main/assets/production/checkpoints
-    scandelete:
-      - app/src/main/assets/btctestnet/checkpoints
-    build:
-      - JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
-      - find src/main/jniLibs -type f -name "libgreenaddress.a" -exec rm -f {} \;
-    ndk: r19c
-
   - versionName: 3.4.9
     versionCode: 349
     commit: release_3.4.9
diff --git a/metadata/com.releasestandard.scriptmanager.yml b/metadata/com.releasestandard.scriptmanager.yml
index ae2cacb9c7..63143b77b6 100644
--- a/metadata/com.releasestandard.scriptmanager.yml
+++ b/metadata/com.releasestandard.scriptmanager.yml
@@ -23,6 +23,7 @@ Builds:
 
   - versionName: '0.4'
     versionCode: 4
+    disable: fails to build
     commit: '0.4'
     subdir: app
     gradle:
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index caa70306ac..630ce2bac6 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3678,9 +3678,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1479'
+    versionCode: 1479
+    commit: '1.1479'
+    subdir: app
+    submodules: true
+    gradle:
+      - fdroid
+    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
+    ndk: r21d
+
 MaintainerNotes: Dynamic versionName and version code, so no autoupdates anymore.
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '1.1474'
-CurrentVersionCode: 1474
+CurrentVersion: '1.1479'
+CurrentVersionCode: 1479
diff --git a/metadata/me.blog.korn123.easydiary.yml b/metadata/me.blog.korn123.easydiary.yml
index c73408e68d..2b0c46dd4b 100644
--- a/metadata/me.blog.korn123.easydiary.yml
+++ b/metadata/me.blog.korn123.easydiary.yml
@@ -294,6 +294,7 @@ Builds:
 
   - versionName: 1.4.159
     versionCode: 225
+    disable: fails to build
     commit: v1.4.159
     subdir: app
     gradle:
diff --git a/metadata/net.schueller.peertube.yml b/metadata/net.schueller.peertube.yml
index d589675011..ef3fe26323 100644
--- a/metadata/net.schueller.peertube.yml
+++ b/metadata/net.schueller.peertube.yml
@@ -222,7 +222,7 @@ Builds:
 
   - versionName: 1.1.0-12d85f58
     versionCode: 1056
-    commit: v1.1.0-12d85f58
+    commit: v1.1.0
     subdir: app
     gradle:
       - yes