diff --git a/metadata/org.jitsi.meet.yml b/metadata/org.jitsi.meet.yml
index 1497bc298a..863130596b 100644
--- a/metadata/org.jitsi.meet.yml
+++ b/metadata/org.jitsi.meet.yml
@@ -453,55 +453,6 @@ Builds:
       - node_modules/react-native-webview/android/build.gradle
       - node_modules/@react-native-community/google-signin/android/build.gradle
 
-  - versionName: 20.5.0
-    versionCode: 205000
-    disable: fails to start
-    commit: android-20.5.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
-    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
-    gradle:
-      - yes
-    rm:
-      - node_modules/jsc-android
-      - node_modules/node-notifier
-      - node_modules/react-native-webrtc/ios
-      - node_modules/bplist-parser
-      - node_modules/css-element-queries
-      - node_modules/jquery-contextmenu
-      - 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/webrtc-adapter/out/adapter.js.gz
-      - node_modules/bowser/bundled.js.gz
-      - node_modules/bowser/es5.js.gz
-    scanignore:
-      - android/build.gradle
-      - android/sdk/build.gradle
-      - node_modules/hermes-engine
-      - 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
-
   - versionName: 20.5.0
     versionCode: 205001
     commit: android-20.5.0
@@ -750,6 +701,54 @@ Builds:
       - node_modules/react-native-device-info/android/build.gradle
     ndk: r21e
 
+  - versionName: 21.2.0
+    versionCode: 212000
+    commit: android-21.2.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/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
@@ -760,5 +759,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 21.1.0
-CurrentVersionCode: 211000
+CurrentVersion: 21.2.0
+CurrentVersionCode: 212000