diff --git a/metadata/com.mattermost.rnbeta.yml b/metadata/com.mattermost.rnbeta.yml
index 692bcd80ea..93c04d1c46 100644
--- a/metadata/com.mattermost.rnbeta.yml
+++ b/metadata/com.mattermost.rnbeta.yml
@@ -2566,8 +2566,6 @@ Builds:
       - npx patch-package --error-on-fail
       - sed -i -e '/InAppReview/d' app/screens/review_app/index.tsx
       - sed -i -e 's/InAppReview.isAvailable()/false/' -e '/InAppReview/d' app/utils/reviews.ts
-      - sed -i -e "/dependencies {/a implementation 'im.conversations.webrtc:webrtc-android:108.0.1'"
-        node_modules/react-native-webrtc/android/build.gradle
       - sed -i -e '/bintray/d' node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
       - sed -E -i '/installreferrer/,+11d' node_modules/react-native-device-info/android/build.gradle
       - sed -i -e 's|maven.fabric.io/public|jitpack.io|' node_modules/react-native-math-view/android/build.gradle
@@ -2582,38 +2580,38 @@ Builds:
       - sed -i -e '/FirebaseMessaging.getInstance/,/});/d' -e '/FirebaseMessaging/d'
         src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
     scanignore:
+      - node_modules/detox/android/build.gradle
+      - node_modules/detox/android/detox/publishing.gradle
       - node_modules/jsc-android
-      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
-      - node_modules/@react-native-community/datetimepicker/android/build.gradle
+      - node_modules/@mattermost/react-native-emm/android/build.gradle
+      - node_modules/@mattermost/react-native-network-client/android/build.gradle
+      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
+      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
+      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
       - node_modules/@react-native-community/netinfo/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/@react-native-cookies/cookies/android/build.gradle
+      - node_modules/react-native-create-thumbnail/android/build.gradle
       - node_modules/react-native-device-info/android/build.gradle
+      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/react-native-fast-image/android/build.gradle
+      - node_modules/react-native-haptic-feedback/android/build.gradle
+      - node_modules/react-native-image-picker/android/build.gradle
+      - node_modules/react-native-linear-gradient/android/build.gradle
       - node_modules/react-native-localize/android/build.gradle
+      - node_modules/react-native-math-view/android/build.gradle
       - node_modules/react-native-navigation/lib/android/build.gradle
       - node_modules/react-native-notifications/lib/android/build.gradle
       - node_modules/react-native-permissions/android/build.gradle
+      - node_modules/react-native-reanimated/android/build.gradle
       - node_modules/react-native-safe-area-context/android/build.gradle
       - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
       - node_modules/react-native-share/android/build.gradle
       - node_modules/react-native-svg/android/build.gradle
       - node_modules/react-native-vector-icons/android/build.gradle
       - node_modules/react-native-webview/android/build.gradle
-      - node_modules/detox/android/build.gradle
-      - node_modules/detox/android/detox/publishing.gradle
-      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
-      - node_modules/@react-native-cookies/cookies/android/build.gradle
-      - node_modules/react-native-math-view/android/build.gradle
-      - node_modules/react-native-fast-image/android/build.gradle
-      - node_modules/@mattermost/react-native-emm/android/build.gradle
-      - node_modules/@mattermost/react-native-network-client/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-mailer/android/build.gradle
-      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
-      - node_modules/react-native-create-thumbnail/android/build.gradle
-      - node_modules/react-native-linear-gradient/android/build.gradle
-      - node_modules/react-native-reanimated/android/build.gradle
-      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
       - node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
+      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
     scandelete:
       - node_modules
     build:
@@ -2661,8 +2659,6 @@ Builds:
       - npx patch-package --error-on-fail
       - sed -i -e '/InAppReview/d' app/screens/review_app/index.tsx
       - sed -i -e 's/InAppReview.isAvailable()/false/' -e '/InAppReview/d' app/utils/reviews.ts
-      - sed -i -e "/dependencies {/a implementation 'im.conversations.webrtc:webrtc-android:108.0.1'"
-        node_modules/react-native-webrtc/android/build.gradle
       - sed -i -e '/bintray/d' node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
       - sed -E -i '/installreferrer/,+11d' node_modules/react-native-device-info/android/build.gradle
       - sed -i -e 's|maven.fabric.io/public|jitpack.io|' node_modules/react-native-math-view/android/build.gradle
@@ -2677,38 +2673,38 @@ Builds:
       - sed -i -e '/FirebaseMessaging.getInstance/,/});/d' -e '/FirebaseMessaging/d'
         src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
     scanignore:
+      - node_modules/detox/android/build.gradle
+      - node_modules/detox/android/detox/publishing.gradle
       - node_modules/jsc-android
-      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
-      - node_modules/@react-native-community/datetimepicker/android/build.gradle
+      - node_modules/@mattermost/react-native-emm/android/build.gradle
+      - node_modules/@mattermost/react-native-network-client/android/build.gradle
+      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
+      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
+      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
       - node_modules/@react-native-community/netinfo/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/@react-native-cookies/cookies/android/build.gradle
+      - node_modules/react-native-create-thumbnail/android/build.gradle
       - node_modules/react-native-device-info/android/build.gradle
+      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/react-native-fast-image/android/build.gradle
+      - node_modules/react-native-haptic-feedback/android/build.gradle
+      - node_modules/react-native-image-picker/android/build.gradle
+      - node_modules/react-native-linear-gradient/android/build.gradle
       - node_modules/react-native-localize/android/build.gradle
+      - node_modules/react-native-math-view/android/build.gradle
       - node_modules/react-native-navigation/lib/android/build.gradle
       - node_modules/react-native-notifications/lib/android/build.gradle
       - node_modules/react-native-permissions/android/build.gradle
+      - node_modules/react-native-reanimated/android/build.gradle
       - node_modules/react-native-safe-area-context/android/build.gradle
       - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
       - node_modules/react-native-share/android/build.gradle
       - node_modules/react-native-svg/android/build.gradle
       - node_modules/react-native-vector-icons/android/build.gradle
       - node_modules/react-native-webview/android/build.gradle
-      - node_modules/detox/android/build.gradle
-      - node_modules/detox/android/detox/publishing.gradle
-      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
-      - node_modules/@react-native-cookies/cookies/android/build.gradle
-      - node_modules/react-native-math-view/android/build.gradle
-      - node_modules/react-native-fast-image/android/build.gradle
-      - node_modules/@mattermost/react-native-emm/android/build.gradle
-      - node_modules/@mattermost/react-native-network-client/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-mailer/android/build.gradle
-      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
-      - node_modules/react-native-create-thumbnail/android/build.gradle
-      - node_modules/react-native-linear-gradient/android/build.gradle
-      - node_modules/react-native-reanimated/android/build.gradle
-      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
       - node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
+      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
     scandelete:
       - node_modules
     build:
@@ -2756,8 +2752,6 @@ Builds:
       - npx patch-package --error-on-fail
       - sed -i -e '/InAppReview/d' app/screens/review_app/index.tsx
       - sed -i -e 's/InAppReview.isAvailable()/false/' -e '/InAppReview/d' app/utils/reviews.ts
-      - sed -i -e "/dependencies {/a implementation 'im.conversations.webrtc:webrtc-android:108.0.1'"
-        node_modules/react-native-webrtc/android/build.gradle
       - sed -i -e '/bintray/d' node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
       - sed -E -i '/installreferrer/,+11d' node_modules/react-native-device-info/android/build.gradle
       - sed -i -e 's|maven.fabric.io/public|jitpack.io|' node_modules/react-native-math-view/android/build.gradle
@@ -2772,38 +2766,38 @@ Builds:
       - sed -i -e '/FirebaseMessaging.getInstance/,/});/d' -e '/FirebaseMessaging/d'
         src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
     scanignore:
+      - node_modules/detox/android/build.gradle
+      - node_modules/detox/android/detox/publishing.gradle
       - node_modules/jsc-android
-      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
-      - node_modules/@react-native-community/datetimepicker/android/build.gradle
+      - node_modules/@mattermost/react-native-emm/android/build.gradle
+      - node_modules/@mattermost/react-native-network-client/android/build.gradle
+      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
+      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
+      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
       - node_modules/@react-native-community/netinfo/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/@react-native-cookies/cookies/android/build.gradle
+      - node_modules/react-native-create-thumbnail/android/build.gradle
       - node_modules/react-native-device-info/android/build.gradle
+      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/react-native-fast-image/android/build.gradle
+      - node_modules/react-native-haptic-feedback/android/build.gradle
+      - node_modules/react-native-image-picker/android/build.gradle
+      - node_modules/react-native-linear-gradient/android/build.gradle
       - node_modules/react-native-localize/android/build.gradle
+      - node_modules/react-native-math-view/android/build.gradle
       - node_modules/react-native-navigation/lib/android/build.gradle
       - node_modules/react-native-notifications/lib/android/build.gradle
       - node_modules/react-native-permissions/android/build.gradle
+      - node_modules/react-native-reanimated/android/build.gradle
       - node_modules/react-native-safe-area-context/android/build.gradle
       - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
       - node_modules/react-native-share/android/build.gradle
       - node_modules/react-native-svg/android/build.gradle
       - node_modules/react-native-vector-icons/android/build.gradle
       - node_modules/react-native-webview/android/build.gradle
-      - node_modules/detox/android/build.gradle
-      - node_modules/detox/android/detox/publishing.gradle
-      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
-      - node_modules/@react-native-cookies/cookies/android/build.gradle
-      - node_modules/react-native-math-view/android/build.gradle
-      - node_modules/react-native-fast-image/android/build.gradle
-      - node_modules/@mattermost/react-native-emm/android/build.gradle
-      - node_modules/@mattermost/react-native-network-client/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-mailer/android/build.gradle
-      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
-      - node_modules/react-native-create-thumbnail/android/build.gradle
-      - node_modules/react-native-linear-gradient/android/build.gradle
-      - node_modules/react-native-reanimated/android/build.gradle
-      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
       - node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
+      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
     scandelete:
       - node_modules
     build:
@@ -2851,8 +2845,6 @@ Builds:
       - npx patch-package --error-on-fail
       - sed -i -e '/InAppReview/d' app/screens/review_app/index.tsx
       - sed -i -e 's/InAppReview.isAvailable()/false/' -e '/InAppReview/d' app/utils/reviews.ts
-      - sed -i -e "/dependencies {/a implementation 'im.conversations.webrtc:webrtc-android:108.0.1'"
-        node_modules/react-native-webrtc/android/build.gradle
       - sed -i -e '/bintray/d' node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
       - sed -E -i '/installreferrer/,+11d' node_modules/react-native-device-info/android/build.gradle
       - sed -i -e 's|maven.fabric.io/public|jitpack.io|' node_modules/react-native-math-view/android/build.gradle
@@ -2867,38 +2859,38 @@ Builds:
       - sed -i -e '/FirebaseMessaging.getInstance/,/});/d' -e '/FirebaseMessaging/d'
         src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
     scanignore:
+      - node_modules/detox/android/build.gradle
+      - node_modules/detox/android/detox/publishing.gradle
       - node_modules/jsc-android
-      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
-      - node_modules/@react-native-community/datetimepicker/android/build.gradle
+      - node_modules/@mattermost/react-native-emm/android/build.gradle
+      - node_modules/@mattermost/react-native-network-client/android/build.gradle
+      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
+      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
+      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
       - node_modules/@react-native-community/netinfo/android/build.gradle
-      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/@react-native-cookies/cookies/android/build.gradle
+      - node_modules/react-native-create-thumbnail/android/build.gradle
       - node_modules/react-native-device-info/android/build.gradle
+      - node_modules/react-native-document-picker/android/build.gradle
+      - node_modules/react-native-fast-image/android/build.gradle
+      - node_modules/react-native-haptic-feedback/android/build.gradle
+      - node_modules/react-native-image-picker/android/build.gradle
+      - node_modules/react-native-linear-gradient/android/build.gradle
       - node_modules/react-native-localize/android/build.gradle
+      - node_modules/react-native-math-view/android/build.gradle
       - node_modules/react-native-navigation/lib/android/build.gradle
       - node_modules/react-native-notifications/lib/android/build.gradle
       - node_modules/react-native-permissions/android/build.gradle
+      - node_modules/react-native-reanimated/android/build.gradle
       - node_modules/react-native-safe-area-context/android/build.gradle
       - node_modules/react-native-screens/android/build.gradle
+      - node_modules/react-native/sdks/hermesc/linux64-bin/hermesc
       - node_modules/react-native-share/android/build.gradle
       - node_modules/react-native-svg/android/build.gradle
       - node_modules/react-native-vector-icons/android/build.gradle
       - node_modules/react-native-webview/android/build.gradle
-      - node_modules/detox/android/build.gradle
-      - node_modules/detox/android/detox/publishing.gradle
-      - node_modules/@mattermost/react-native-paste-input/android/build.gradle
-      - node_modules/@react-native-cookies/cookies/android/build.gradle
-      - node_modules/react-native-math-view/android/build.gradle
-      - node_modules/react-native-fast-image/android/build.gradle
-      - node_modules/@mattermost/react-native-emm/android/build.gradle
-      - node_modules/@mattermost/react-native-network-client/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-log/android/build.gradle
-      - node_modules/@mattermost/react-native-turbo-mailer/android/build.gradle
-      - node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
-      - node_modules/react-native-create-thumbnail/android/build.gradle
-      - node_modules/react-native-linear-gradient/android/build.gradle
-      - node_modules/react-native-reanimated/android/build.gradle
-      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
       - node_modules/@rudderstack/rudder-sdk-react-native/android/build.gradle
+      - node_modules/@stream-io/flat-list-mvcp/android/build.gradle
     scandelete:
       - node_modules
     build: