diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 4af68100ba..05ea80f629 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -80,21 +80,9 @@ lane :alpha do
 end
 
 lane :unit_tests do |options|
-  create_simulator_if_necessary(
-    name: "iPhone 16 (Element X)",
-    type: "com.apple.CoreSimulator.SimDeviceType.iPhone-16",
-    runtime: "com.apple.CoreSimulator.SimRuntime.iOS-18-0"
-  )
-  
-  create_simulator_if_necessary(
-    name: "iPhone SE (Element X)",
-    type: "com.apple.CoreSimulator.SimDeviceType.iPhone-SE-3rd-generation",
-    runtime: "com.apple.CoreSimulator.SimRuntime.iOS-18-0"
-  )
-  
   run_tests(
     scheme: "UnitTests",
-    device: "iPhone 16 (Element X)",
+    destination: "platform=iOS Simulator,name=iPhone 16,OS=18.0",
     ensure_devices_found: true,
     result_bundle: true,
     number_of_retries: 3,
@@ -103,7 +91,7 @@ lane :unit_tests do |options|
   if !options[:skip_previews]
     run_tests(
       scheme: "PreviewTests",
-      device: "iPhone SE (Element X)",
+      destination: "platform=iOS Simulator,name=iPhone SE (3rd generation),OS=18.0",
       ensure_devices_found: true,
       result_bundle: true,
       number_of_retries: 3,
@@ -119,13 +107,13 @@ lane :ui_tests do |options|
   # reset_simulator_contents()
   
   create_simulator_if_necessary(
-    name: "iPhone 16 (Element X)",
+    name: "iPhone 16",
     type: "com.apple.CoreSimulator.SimDeviceType.iPhone-16",
     runtime: "com.apple.CoreSimulator.SimRuntime.iOS-18-0"
   )
   
   create_simulator_if_necessary(
-    name: "iPad (Element X)",
+    name: "iPad (10th generation)",
     type: "com.apple.CoreSimulator.SimDeviceType.iPad-10th-generation",
     runtime: "com.apple.CoreSimulator.SimRuntime.iOS-18-0"
   )
@@ -138,7 +126,7 @@ lane :ui_tests do |options|
 
   run_tests(
     scheme: "UITests",
-    devices: ["iPhone 16 (Element X)", "iPad (Element X)"],
+    devices: ["iPhone 16", "iPad (10th generation)"],
     ensure_devices_found: true,
     prelaunch_simulator: true,
     result_bundle: true,
@@ -152,14 +140,14 @@ lane :integration_tests do
   clear_derived_data()
   
   create_simulator_if_necessary(
-    name: "iPhone 16 Pro (Element X)",
+    name: "iPhone 16 Pro",
     type: "com.apple.CoreSimulator.SimDeviceType.iPhone-16-Pro",
     runtime: "com.apple.CoreSimulator.SimRuntime.iOS-18-0"
   )
 
   run_tests(
     scheme: "IntegrationTests",
-    devices: ["iPhone 16 Pro (Element X)"],
+    destination: "platform=iOS Simulator,name=iPhone 16 Pro,OS=18.0",
     ensure_devices_found: true,
     result_bundle: true,
     reset_simulator: true