diff --git a/metadata/eu.faircode.email.yml b/metadata/eu.faircode.email.yml
index 7c797ac646..3c7ffc7e77 100644
--- a/metadata/eu.faircode.email.yml
+++ b/metadata/eu.faircode.email.yml
@@ -3808,29 +3808,9 @@ Builds:
     prebuild: sed -i -e '/keystoreProperties/d' build.gradle
     ndk: r21e
 
-  - versionName: '1.1540'
-    versionCode: 1540
-    commit: '1.1540'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21e
-
-  - versionName: '1.1541'
-    versionCode: 1541
-    commit: '1.1541'
-    subdir: app
-    submodules: true
-    gradle:
-      - fdroid
-    prebuild: sed -i -e '/keystoreProperties/d' build.gradle
-    ndk: r21e
-
-  - versionName: '1.1542'
-    versionCode: 1542
-    commit: '1.1542'
+  - versionName: '1.1543'
+    versionCode: 1543
+    commit: '1.1543'
     subdir: app
     submodules: true
     gradle:
@@ -3842,5 +3822,5 @@ AutoUpdateMode: Version %v
 UpdateCheckMode: HTTP
 UpdateCheckData: https://raw.githubusercontent.com/M66B/FairEmail/master/app/build.gradle|return
     (\d+)|https://github.com/M66B/FairEmail/releases/latest|tree/([\d.]+)
-CurrentVersion: '1.1542'
-CurrentVersionCode: 1542
+CurrentVersion: '1.1543'
+CurrentVersionCode: 1543
diff --git a/metadata/org.jitsi.meet.yml b/metadata/org.jitsi.meet.yml
index e445dcdf36..bc705e8eb4 100644
--- a/metadata/org.jitsi.meet.yml
+++ b/metadata/org.jitsi.meet.yml
@@ -652,6 +652,55 @@ Builds:
       - node_modules/react-native-webview/android/build.gradle
       - node_modules/react-native/android
 
+  - versionName: 21.0.0
+    versionCode: 210000
+    commit: android-21.0.0
+    subdir: android/app
+    sudo:
+      - sysctl fs.inotify.max_user_watches=524288
+      - sysctl -p
+      - apt-get update || apt-get update
+      - apt-get install -y -t stretch-backports npm androguard
+    init:
+      - sed -E -i 's/^.*(fabric|com\.(crashlytics|google\.(firebase|android.gms))).*$//g'
+        build.gradle
+      - sed -E -i 's/^.*fabric.*$//g' ../build.gradle
+      - sed -E -i 's/libreBuild =.*$/libreBuild = true/g' ../build.gradle
+      - sed -E -i 's/^.*fabric.*$//g' ../../package.json
+      - sed -E -i 's/vcode =.*$/vcode = $$VERCODE$$/g' build.gradle
+      - sed -i '/flow-bin/d' ../../package.json
+      - sed -E -i 's/^.*libflacjs.*$//g' ../../package.json
+      - export LIBRE_BUILD=true
+      - npm install
+      - truncate -s 0 ../../node_modules/react-native/node_modules/@react-native-community/cli/build/commands/server/external/xsel
+      - sed -E -i 's/^.*google.*play.*services.*$//g' ../../node_modules/@react-native-community/google-signin/android/build.gradle
+      - sed -E -i '/installreferrer/,+11d' ../../node_modules/react-native-device-info/android/build.gradle
+    gradle:
+      - yes
+    rm:
+      - node_modules/hermes-engine
+      - node_modules/node-notifier
+      - node_modules/react-native-webrtc/ios
+      - node_modules/bplist-parser
+      - node_modules/jQuery-Impromptu
+      - node_modules/jetifier/lib/*.jar
+      - node_modules/react-native/template
+      - node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
+      - node_modules/bowser/bundled.js.gz
+      - node_modules/bowser/es5.js.gz
+    scanignore:
+      - android/build.gradle
+      - android/sdk/build.gradle
+      - node_modules/jsc-android
+      - node_modules/react-native-svg/android/build.gradle
+      - node_modules/react-native-webrtc
+      - node_modules/react-native/android
+      - node_modules/react-native-webview/android/build.gradle
+      - node_modules/@react-native-community/google-signin/android/build.gradle
+      - node_modules/@react-native-async-storage/async-storage/android/build.gradle
+      - node_modules/react-native-device-info/android/build.gradle
+    ndk: r21e
+
 MaintainerNotes: |-
     3 directories are currently (scan)ignored as they contain binaries which are currently deemed acceptable for inclusion
       - React Native
@@ -661,6 +710,6 @@ MaintainerNotes: |-
     Jitsi Meet is fully funded by 8x8 and does not take donations.
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags ^android-[0-9.]*$
-CurrentVersion: 1.0.0
-CurrentVersionCode: 2000000000
+UpdateCheckMode: None
+CurrentVersion: 21.0.0
+CurrentVersionCode: 210000