diff --git a/metadata/ch.protonvpn.android.yml b/metadata/ch.protonvpn.android.yml
index 631c1da36a..a748dc017e 100644
--- a/metadata/ch.protonvpn.android.yml
+++ b/metadata/ch.protonvpn.android.yml
@@ -276,7 +276,7 @@ Builds:
       - buildUniversalApk
 
   - versionName: 2.4.1.0
-    versionCode: 102041000
+    versionCode: 102040100
     commit: 2.4.1.0
     subdir: app
     submodules: true
@@ -333,4 +333,4 @@ AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
 UpdateCheckData: https://raw.githubusercontent.com/ProtonVPN/android-app/master/metadata/version_fdroid.txt|versionCode=(.*)|.|versionName=(.*)
 CurrentVersion: 2.4.1.0
-CurrentVersionCode: 102041000
+CurrentVersionCode: 102040100
diff --git a/metadata/com.aidinhut.simpletextcrypt.yml b/metadata/com.aidinhut.simpletextcrypt.yml
index 98357d3784..ee53fd7ad0 100644
--- a/metadata/com.aidinhut.simpletextcrypt.yml
+++ b/metadata/com.aidinhut.simpletextcrypt.yml
@@ -58,6 +58,7 @@ Builds:
 
   - versionName: '4.3'
     versionCode: 11
+    disable: fails to build
     commit: v4.3
     subdir: app
     gradle:
@@ -65,7 +66,6 @@ Builds:
 
   - versionName: '4.4'
     versionCode: 12
-    disable: fails to build
     commit: v4.4
     subdir: app
     gradle:
diff --git a/metadata/com.cookiegames.smartcookie.yml b/metadata/com.cookiegames.smartcookie.yml
index 284fd69429..c3f79f5b48 100644
--- a/metadata/com.cookiegames.smartcookie.yml
+++ b/metadata/com.cookiegames.smartcookie.yml
@@ -291,21 +291,14 @@ Builds:
     gradle:
       - scMain
 
-  - versionName: 9.3.1
-    versionCode: 128
-    commit: v9.3.1
-    subdir: app
-    gradle:
-      - scMain
-
   - versionName: 9.3.2
     versionCode: 129
-    commit: v9.3.2
+    commit: v9.3.3
     subdir: app
     gradle:
       - scMain
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: None
 UpdateCheckMode: Tags
 CurrentVersion: 9.3.2
 CurrentVersionCode: 129
diff --git a/metadata/com.example.barcodescanner.yml b/metadata/com.example.barcodescanner.yml
index d02f6c01bc..6b6c49d412 100644
--- a/metadata/com.example.barcodescanner.yml
+++ b/metadata/com.example.barcodescanner.yml
@@ -41,6 +41,7 @@ Builds:
 
   - versionName: '1.6'
     versionCode: 8
+    disable: fails to build, see upstream issue 49
     commit: v1.6
     subdir: app
     gradle:
diff --git a/metadata/com.freshollie.monkeyboard.keystoneradio.yml b/metadata/com.freshollie.monkeyboard.keystoneradio.yml
index 40a9d126fd..2944c81ba0 100644
--- a/metadata/com.freshollie.monkeyboard.keystoneradio.yml
+++ b/metadata/com.freshollie.monkeyboard.keystoneradio.yml
@@ -33,7 +33,7 @@ Builds:
 
   - versionName: 2.1.7-beta
     versionCode: 116
-    commit: v2.1.7-beta
+    commit: v2.1.7
     subdir: app
     submodules: true
     gradle:
diff --git a/metadata/com.nextcloud.android.beta.yml b/metadata/com.nextcloud.android.beta.yml
index 536439cf5b..deddf26151 100644
--- a/metadata/com.nextcloud.android.beta.yml
+++ b/metadata/com.nextcloud.android.beta.yml
@@ -5978,22 +5978,6 @@ Builds:
     scandelete:
       - src/androidTest
 
-  - versionName: '20201105'
-    versionCode: 20201105
-    commit: dev-20201105
-    submodules: true
-    gradle:
-      - versionDev
-    rm:
-      - user_manual
-      - gplay.gradle
-    prebuild:
-      - mkdir -p $HOME/.gradle
-      - echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
-        > $HOME/.gradle/gradle.properties
-    scandelete:
-      - src/androidTest
-
   - versionName: '20201106'
     versionCode: 20201106
     commit: dev-20201106