diff --git a/xcode/commonFastfile b/xcode/commonFastfile
index 494465b..4e36946 100644
--- a/xcode/commonFastfile
+++ b/xcode/commonFastfile
@@ -148,15 +148,16 @@ private_lane :buildArchive do |options|
   lane_name = options[:lane_name]
   configuration = options[:configuration]
   xcodeproj_path = options[:xcodeproj_path]
-  xcode_version = options[:xcodeVersion]
+  default_xcode_version = sh("xcodebuild -version") # Xcode <version> Build version <version>
+    .split(" ")[1]
+
+  xcode_version = options[:xcodeVersion] || default_xcode_version
 
   if configuration != "AppStore" # AppStore uses xcconfig choosen in Xcode
     set_xcconfig_for_configuration_of_project(lane_name, configuration, xcodeproj_path)
   end
 
-  if !xcode_version.nil? 
-    ensure_xcode_version(version: xcode_version)
-  end
+  xcversion(version: xcode_version)
 
   gym(
     clean: true,