diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 196bc8d4e0..9d9eb74a0e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -226,31 +226,27 @@ platform :ios do
   lane :build_tv_watch_mac do |options|
     check_pods
     load_spm_dependencies
-    carthage(command: "build", no_skip_current: true, platform: "watchOS,tvOS,Mac", use_xcframeworks: true)
+    build_release(platform: 'watchOS')
+    build_release(platform: 'tvOS')
+    build_release(platform: 'macOS')
   end
 
   desc "macOS build"
   lane :build_mac do |options|
     check_pods
     load_spm_dependencies
-    carthage(command: "build", no_skip_current: true, platform: "Mac", use_xcframeworks: true)
+    build_release(platform: 'macOS')
   end
 
   desc "visionOS build"
   lane :build_visionos do |options|
-    xcodebuild(
-      workspace: 'RevenueCat.xcworkspace',
-      scheme: 'RevenueCat',
-      destination: 'generic/platform=visionOS',
-      configuration: 'release',
-      xcargs: "CODE_SIGN_IDENTITY='' CODE_SIGNING_REQUIRED=NO"
+    build_release(
+      platform: 'visionOS',
+      scheme: 'RevenueCat'
     )
-    xcodebuild(
-      workspace: 'RevenueCat.xcworkspace',
-      scheme: 'RevenueCatUI',
-      destination: 'generic/platform=visionOS',
-      configuration: 'release',
-      xcargs: "CODE_SIGN_IDENTITY='' CODE_SIGNING_REQUIRED=NO"
+    build_release(
+      platform: 'visionOS',
+      scheme: 'RevenueCatUI'
     )
   end
 
@@ -419,6 +415,19 @@ platform :ios do
     )
   end
 
+  private_lane :build_release do |options|
+    platform = options[:platform]
+    scheme = options[:scheme] || 'RevenueCat'
+
+    xcodebuild(
+      workspace: 'RevenueCat.xcworkspace',
+      scheme: scheme,
+      destination: "generic/platform=#{platform}",
+      configuration: 'release',
+      xcargs: "CODE_SIGN_IDENTITY='' CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=YES"
+    )
+  end
+
   private_lane :generate_snapshots do |options|
     require 'rest-client'