diff --git a/metadata/com.mattermost.rnbeta.yml b/metadata/com.mattermost.rnbeta.yml
index dae5b55887..519dbe3cd4 100644
--- a/metadata/com.mattermost.rnbeta.yml
+++ b/metadata/com.mattermost.rnbeta.yml
@@ -305,194 +305,6 @@ Builds:
     scandelete:
       - node_modules
 
-  - versionName: 1.20.0
-    versionCode: 198
-    commit: v1.20.0
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288
-      - sysctl -p
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t stretch-backports npm
-    init:
-      - sed -i -e '/react-native-youtube/d' ../../package.json build.gradle ../settings.gradle
-        ../../app/components/post_body_additional_content/post_body_additional_content.js
-      - make -C ../.. pre-run
-    gradle:
-      - yes
-    rm:
-      - node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/gcm/
-      - node_modules/sc-uws/*.node
-      - node_modules/sc-uws/build/
-      - node_modules/xdate/build/compiler.jar
-      - node_modules/react-native-video/android-exoplayer/build/
-      - node_modules/socketcluster/
-      - node_modules/shaka-player/third_party/closure/compiler.jar
-      - node_modules/.bin/socketcluster
-    prebuild:
-      - "sed -i -e '/play-services-gcm/,+2d' -e 's/bundleCommand: \"ram-bundle\",/bundleCommand:\
-        \ \"ram-bundle\", nodeExecutableAndArgs: [\"node\", \"--max-old-space-size=12000\"\
-        ],/' build.gradle"
-      - sed -i -e '/ReactNativeYouTube/d' src/main/java/com/mattermost/rnbeta/MainApplication.java
-      - sed -i -e '/com.google.android.gms.iid.InstanceID.getInstance/d' ../../node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
-      - sed -i -e '/play-services/d' ../../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e '/firebase/d' ../../node_modules/react-native-notifications/android/build.gradle
-        build.gradle
-      - sed -i -e '/hasPermission/d' -e '/tokenFetchIntent/d' -e '/FcmInstance/d'
-        -e '/FirebaseApp/'d ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
-        ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
-      - sed -i -e '/maven {/,+2d' ../../node_modules/react-native-document-picker/android/build.gradle
-      - truncate -s 0 ../../node_modules/react-native/local-cli/server/util/external/xsel
-    scanignore:
-      - android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/react-native-navigation/android/build.gradle
-      - node_modules/react-native-image-picker/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-    scandelete:
-      - node_modules
-
-  - versionName: 1.21.0
-    versionCode: 208
-    commit: v1.21.0
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288
-      - sysctl -p
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t stretch-backports npm
-    init:
-      - sed -i -e '/react-native-youtube/d' ../../package.json build.gradle ../settings.gradle
-        ../../app/components/post_body_additional_content/post_body_additional_content.js
-      - make -C ../.. pre-run
-    gradle:
-      - yes
-    rm:
-      - node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/gcm/
-      - node_modules/sc-uws/*.node
-      - node_modules/sc-uws/build/
-      - node_modules/xdate/build/compiler.jar
-      - node_modules/react-native-video/android-exoplayer/build/
-      - node_modules/socketcluster/
-      - node_modules/shaka-player/third_party/closure/compiler.jar
-      - node_modules/.bin/socketcluster
-    prebuild:
-      - "sed -i -e '/play-services-gcm/,+2d' -e 's/bundleCommand: \"ram-bundle\",/bundleCommand:\
-        \ \"ram-bundle\", nodeExecutableAndArgs: [\"node\", \"--max-old-space-size=12000\"\
-        ],/' build.gradle"
-      - sed -i -e '/ReactNativeYouTube/d' src/main/java/com/mattermost/rnbeta/MainApplication.java
-      - sed -i -e '/com.google.android.gms.iid.InstanceID.getInstance/d' ../../node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
-      - sed -i -e '/play-services/d' ../../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e '/firebase/d' ../../node_modules/react-native-notifications/android/build.gradle
-        build.gradle
-      - sed -i -e '/hasPermission/d' -e '/tokenFetchIntent/d' -e '/FcmInstance/d'
-        -e '/FirebaseApp/'d ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
-        ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
-      - sed -i -e '/maven {/,+2d' ../../node_modules/react-native-document-picker/android/build.gradle
-      - truncate -s 0 ../../node_modules/react-native/local-cli/server/util/external/xsel
-    scanignore:
-      - android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/react-native-navigation/android/build.gradle
-      - node_modules/react-native-image-picker/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-    scandelete:
-      - node_modules
-
-  - versionName: 1.21.1
-    versionCode: 210
-    commit: v1.21.1
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288
-      - sysctl -p
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t stretch-backports npm
-    init:
-      - sed -i -e '/react-native-youtube/d' ../../package.json build.gradle ../settings.gradle
-        ../../app/components/post_body_additional_content/post_body_additional_content.js
-      - make -C ../.. pre-run
-    gradle:
-      - yes
-    rm:
-      - node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/gcm/
-      - node_modules/sc-uws/*.node
-      - node_modules/sc-uws/build/
-      - node_modules/xdate/build/compiler.jar
-      - node_modules/react-native-video/android-exoplayer/build/
-      - node_modules/socketcluster/
-      - node_modules/shaka-player/third_party/closure/compiler.jar
-      - node_modules/.bin/socketcluster
-    prebuild:
-      - "sed -i -e '/play-services-gcm/,+2d' -e 's/bundleCommand: \"ram-bundle\",/bundleCommand:\
-        \ \"ram-bundle\", nodeExecutableAndArgs: [\"node\", \"--max-old-space-size=12000\"\
-        ],/' build.gradle"
-      - sed -i -e '/ReactNativeYouTube/d' src/main/java/com/mattermost/rnbeta/MainApplication.java
-      - sed -i -e '/com.google.android.gms.iid.InstanceID.getInstance/d' ../../node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
-      - sed -i -e '/play-services/d' ../../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e '/firebase/d' ../../node_modules/react-native-notifications/android/build.gradle
-        build.gradle
-      - sed -i -e '/hasPermission/d' -e '/tokenFetchIntent/d' -e '/FcmInstance/d'
-        -e '/FirebaseApp/'d ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
-        ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
-      - sed -i -e '/maven {/,+2d' ../../node_modules/react-native-document-picker/android/build.gradle
-      - truncate -s 0 ../../node_modules/react-native/local-cli/server/util/external/xsel
-    scanignore:
-      - android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/react-native-navigation/android/build.gradle
-      - node_modules/react-native-image-picker/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-    scandelete:
-      - node_modules
-
-  - versionName: 1.21.2
-    versionCode: 215
-    commit: v1.21.2
-    subdir: android/app
-    sudo:
-      - sysctl fs.inotify.max_user_watches=524288
-      - sysctl -p
-      - apt-get update || apt-get update
-      - apt-get install -y --no-install-recommends -t stretch-backports npm
-    init:
-      - sed -i -e '/react-native-youtube/d' ../../package.json build.gradle ../settings.gradle
-        ../../app/components/post_body_additional_content/post_body_additional_content.js
-      - make -C ../.. pre-run
-    gradle:
-      - yes
-    rm:
-      - node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/gcm/
-      - node_modules/sc-uws/*.node
-      - node_modules/sc-uws/build/
-      - node_modules/xdate/build/compiler.jar
-      - node_modules/react-native-video/android-exoplayer/build/
-      - node_modules/socketcluster/
-      - node_modules/shaka-player/third_party/closure/compiler.jar
-      - node_modules/.bin/socketcluster
-    prebuild:
-      - "sed -i -e '/play-services-gcm/,+2d' -e 's/bundleCommand: \"ram-bundle\",/bundleCommand:\
-        \ \"ram-bundle\", nodeExecutableAndArgs: [\"node\", \"--max-old-space-size=12000\"\
-        ],/' build.gradle"
-      - sed -i -e '/ReactNativeYouTube/d' src/main/java/com/mattermost/rnbeta/MainApplication.java
-      - sed -i -e '/com.google.android.gms.iid.InstanceID.getInstance/d' ../../node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
-      - sed -i -e '/play-services/d' ../../node_modules/react-native-device-info/android/build.gradle
-      - sed -i -e '/firebase/d' ../../node_modules/react-native-notifications/android/build.gradle
-        build.gradle
-      - sed -i -e '/hasPermission/d' -e '/tokenFetchIntent/d' -e '/FcmInstance/d'
-        -e '/FirebaseApp/'d ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
-        ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
-      - sed -i -e '/maven {/,+2d' ../../node_modules/react-native-document-picker/android/build.gradle
-      - truncate -s 0 ../../node_modules/react-native/local-cli/server/util/external/xsel
-    scanignore:
-      - android/build.gradle
-      - node_modules/react-native-svg/android/build.gradle
-      - node_modules/react-native-navigation/android/build.gradle
-      - node_modules/react-native-image-picker/android/build.gradle
-      - node_modules/react-native-webview/android/build.gradle
-    scandelete:
-      - node_modules
-
   - versionName: 1.22.0
     versionCode: 221
     commit: v1.22.0
@@ -530,7 +342,7 @@ Builds:
         -e '/FirebaseApp/'d ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
         ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
       - sed -i -e '/maven {/,+2d' ../../node_modules/react-native-document-picker/android/build.gradle
-      - truncate -s 0 ../../node_modules/react-native/local-cli/server/util/external/xsel
+      - truncate -s 0 ../../node_modules/@react-native-community/cli/build/commands/server/external/xsel
     scanignore:
       - android/build.gradle
       - node_modules/react-native-svg/android/build.gradle