diff --git a/metadata/com.mattermost.rnbeta.yml b/metadata/com.mattermost.rnbeta.yml
index 7de6cd8c5b..6118a2bd8d 100644
--- a/metadata/com.mattermost.rnbeta.yml
+++ b/metadata/com.mattermost.rnbeta.yml
@@ -142,14 +142,20 @@ Builds:
       - 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' 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
-        ../../node_modules/react-native-notifications/android/build.gradle
-      - sed -i -e '/hasPermission/d' -e '/tokenFetchIntent/d' -e '/GcmInstance/d'
-        ../../node_modules/react-native-notifications/android/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
+      - 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:
@@ -157,6 +163,7 @@ Builds:
       - 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