diff --git a/android/app/build.gradle b/android/app/build.gradle
index 67548e1f95..baa0ce873f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -85,6 +85,15 @@ project.ext.react = [
 apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
 
+if (System.getenv("SENTRY_ENABLED") == "true") {
+    project.ext.sentryCli = [
+        logLevel: "error",
+        flavorAware: false
+    ]
+
+    apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
+}
+
 /**
  * Set this to true to create two separate APKs instead of one:
  *   - An APK that only works on ARM devices
@@ -369,15 +378,6 @@ task copyDownloadableDepsToLibs(type: Copy) {
     into 'libs'
 }
 
-if (System.getenv("SENTRY_ENABLED") == "true") {
-    project.ext.sentryCli = [
-        logLevel: "error",
-        flavorAware: false
-    ]
-
-    apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
-}
-
 apply plugin: 'com.google.gms.google-services'
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 815f782125..11d85d7748 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -177,7 +177,7 @@ lane :upload_file_to_s3 do |options|
   extension = os_type == "android" ? "*.apk" : "*.ipa"
   build_folder_path = Dir[File.expand_path('..')].first
   files = []
-
+  
   unless options[:file].nil? || options[:file].empty?
     files.push("#{build_folder_path}/#{options[:file]}")
   else
@@ -194,7 +194,7 @@ lane :upload_file_to_s3 do |options|
       pr_file = File.basename(files.first)
       plist_file = "#{File.basename(files.first, '.*')}.plist"
     else
-      version_number = os_type == "android" ?
+      version_number = os_type == "android" ? 
         android_get_version_name(gradle_file: './android/app/build.gradle') :
         get_version_number(xcodeproj: './ios/Mattermost.xcodeproj', target: 'Mattermost')
       build_number = os_type == "android" ?
@@ -207,7 +207,7 @@ lane :upload_file_to_s3 do |options|
     s3_folder = is_build_pr ?
       "#{ENV['AWS_FOLDER_NAME']}/#{ENV['BRANCH_TO_BUILD']}" :
       "#{ENV['AWS_FOLDER_NAME']}/#{version_number}/#{build_number}"
-
+    
     s3 = Aws::S3::Resource.new(region: s3_region)
     s3_bucket = s3.bucket(s3_bucket_name)
     mutex = Mutex.new
@@ -254,7 +254,7 @@ lane :upload_file_to_s3 do |options|
                             :install_url => install_url
                         })
     end
-
+  
     if options[:file] == 'Mattermost-simulator-x86_64.app.zip'
       pretext = '#### New iOS build for VM/Simulator'
       msg = "Download link: #{links.first}"
@@ -741,8 +741,7 @@ platform :android do
         properties: {
           'separateApk' => ENV["SEPARATE_APKS"] || false,
           'universalApk' => ENV["SEPARATE_APKS"] || false,
-        },
-        flags: "-Dorg.gradle.daemon=false --max-workers=2 -Dkotlin.compiler.execution.strategy=in-process"
+        }
     )
   end
 
@@ -851,14 +850,14 @@ def get_apple_api_key
           f.write("\n") unless index == p8_array.length - 1
         end
       end
-
+    
       api_key = app_store_connect_api_key(
         key_id: ENV['IOS_API_KEY_ID'],
         issuer_id: ENV['IOS_API_ISSUER_ID'],
         key_filepath: "./#{api_key_path}",
         in_house: ENV['IOS_IN_HOUSE'] == 'true', # optional but may be required if using match/sigh
       )
-
+    
       File.delete("../#{api_key_path}")
     end
 
diff --git a/metro.config.js b/metro.config.js
index c7f2322f45..5633b4dcc2 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -21,6 +21,5 @@ module.exports = (async () => {
             assetExts: assetExts.filter((ext) => ext !== 'svg'),
             sourceExts: [...sourceExts, 'svg'],
         },
-        maxWorkers: 2,
     };
 })();