diff --git a/metadata/com.termux.yml b/metadata/com.termux.yml
index d94a539246..4751903cbd 100644
--- a/metadata/com.termux.yml
+++ b/metadata/com.termux.yml
@@ -639,6 +639,7 @@ Builds:
 
   - versionName: '0.105'
     versionCode: 105
+    disable: crash on start upstream issue 1896
     commit: v0.105
     subdir: app
     gradle:
diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 17f105d782..31dcd7f5fa 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3648,9 +3648,19 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21d
 
+  - versionName: '1.1464'
+    versionCode: 1464
+    commit: '1.1464'
+    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.1462'
-CurrentVersionCode: 1462
+CurrentVersion: '1.1464'
+CurrentVersionCode: 1464
diff --git a/metadata/openfoodfacts.github.scrachx.openbeauty.yml b/metadata/openfoodfacts.github.scrachx.openbeauty.yml
index ce6de54536..36f9f672c0 100644
--- a/metadata/openfoodfacts.github.scrachx.openbeauty.yml
+++ b/metadata/openfoodfacts.github.scrachx.openbeauty.yml
@@ -255,19 +255,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.6.2
-    versionCode: 362
-    disable: fails to build
-    commit: 3.6.2
-    subdir: app
-    gradle:
-      - obf
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.3
     versionCode: 431
+    disable: fails to build
     commit: 3.6.3
     subdir: app
     gradle:
@@ -276,7 +266,7 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle.kts
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 3.6.3
 CurrentVersionCode: 431
diff --git a/metadata/openfoodfacts.github.scrachx.openfood.yml b/metadata/openfoodfacts.github.scrachx.openfood.yml
index e0dbbd3dbb..0652982c8d 100644
--- a/metadata/openfoodfacts.github.scrachx.openfood.yml
+++ b/metadata/openfoodfacts.github.scrachx.openfood.yml
@@ -416,19 +416,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.6.2
-    versionCode: 362
-    disable: fails to build
-    commit: 3.6.2
-    subdir: app
-    gradle:
-      - 'off'
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.3
     versionCode: 431
+    disable: fails to build
     commit: 3.6.3
     subdir: app
     gradle:
@@ -437,7 +427,7 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle.kts
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 3.6.3
 CurrentVersionCode: 431
diff --git a/metadata/org.openpetfoodfacts.scanner.yml b/metadata/org.openpetfoodfacts.scanner.yml
index d8687b0eb5..a10a1bccb0 100644
--- a/metadata/org.openpetfoodfacts.scanner.yml
+++ b/metadata/org.openpetfoodfacts.scanner.yml
@@ -202,19 +202,9 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle
 
-  - versionName: 3.6.2
-    versionCode: 362
-    disable: fails to build
-    commit: 3.6.2
-    subdir: app
-    gradle:
-      - opff
-    prebuild:
-      - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
-      - sed -i '/javaMaxHeapSize/d' build.gradle.kts
-
   - versionName: 3.6.3
     versionCode: 431
+    disable: fails to build
     commit: 3.6.3
     subdir: app
     gradle:
@@ -223,7 +213,7 @@ Builds:
       - sed -i 's/\r$//' ../gradle/wrapper/gradle-wrapper.properties
       - sed -i '/javaMaxHeapSize/d' build.gradle.kts
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 3.6.3
 CurrentVersionCode: 431
diff --git a/metadata/org.voidsink.anewjkuapp.yml b/metadata/org.voidsink.anewjkuapp.yml
index 09f9d1eff4..846717fa42 100644
--- a/metadata/org.voidsink.anewjkuapp.yml
+++ b/metadata/org.voidsink.anewjkuapp.yml
@@ -295,7 +295,7 @@ Builds:
 
   - versionName: 0.53.5-fdroid
     versionCode: 140084
-    commit: v0.53.5-fdroid
+    commit: v0.53.5
     subdir: app
     gradle:
       - fdroid
diff --git a/metadata/threads.server.yml b/metadata/threads.server.yml
index 70e1dd4759..9f56f82b04 100644
--- a/metadata/threads.server.yml
+++ b/metadata/threads.server.yml
@@ -123,13 +123,6 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 2.0.7
-    versionCode: 207
-    commit: 2.0.7
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 2.0.8
     versionCode: 208
     commit: 2.0.8