diff --git a/eas.json b/eas.json
index 0c83134356..8c4ce93a48 100644
--- a/eas.json
+++ b/eas.json
@@ -1,14 +1,7 @@
 {
   "build": {
     "release": {
-      "android": {
-        "workflow": "managed",
-        "releaseChannel": "production"
-      },
-      "ios": {
-        "workflow": "managed",
-        "releaseChannel": "production"
-      }
+      "releaseChannel": "production"
     }
   }
 }
diff --git a/metro.config.js b/metro.config.js
index 8b03bdf8a7..93c22771e1 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -1,7 +1,6 @@
-module.exports = {
-  resolver: {
-    extraNodeModules: {
-      stream: require.resolve('stream-browserify')
-    }
-  }
-}
+const { getDefaultConfig } = require('@expo/metro-config')
+const defaultConfig = getDefaultConfig(__dirname)
+
+defaultConfig.resolver.extraNodeModules.stream = require.resolve('stream-browserify')
+
+module.exports = defaultConfig
diff --git a/package-lock.json b/package-lock.json
index 050eec4e2b..97002757ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -76,6 +76,7 @@
       "devDependencies": {
         "@babel/core": "~7.9.0",
         "@cypress/code-coverage": "^3.9.9",
+        "@expo/metro-config": "^0.1.82",
         "@testing-library/cypress": "^8.0.0",
         "@testing-library/react-hooks": "^7.0.0",
         "@testing-library/react-native": "^7.2.0",
diff --git a/package.json b/package.json
index fe261c82b3..258c37d3c8 100644
--- a/package.json
+++ b/package.json
@@ -85,6 +85,7 @@
   "devDependencies": {
     "@babel/core": "~7.9.0",
     "@cypress/code-coverage": "^3.9.9",
+    "@expo/metro-config": "^0.1.82",
     "@testing-library/cypress": "^8.0.0",
     "@testing-library/react-hooks": "^7.0.0",
     "@testing-library/react-native": "^7.2.0",