diff --git a/fastlane/.env b/fastlane/.env
index 3bb0d550..423e3294 100644
--- a/fastlane/.env
+++ b/fastlane/.env
@@ -4,8 +4,8 @@ XCODE_BUILDLOG_PATH="./Output/BuildLogs/"
 
 FASTLANE_TEAM_ID="95V535S6TQ"
 
-DEFAULT_TEST_DEVICE="iPhone 15"
-DEFAULT_TEST_OS_VERSION="17.0.1"
+DEFAULT_TEST_DEVICE="iPhone 16 Pro"
+DEFAULT_TEST_OS_VERSION="18.5"
 
 GYM_CONFIGURATION="Release"
 GYM_SCHEME="JudoKit_iOS"
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index a90ef5cf..6a0f1dc6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -171,14 +171,15 @@ platform :ios do
       workspace: options[:app].workspace,
     })
 
+    build_instrumented_tests_packages({
+      app: options[:app],
+      environment: options[:environment]
+    }) if !options[:app].ui_test_scheme.nil?
+
     revert_staging_environment(
       app: options[:app],
       sdk_root_path: @project_root_path
     ) if options[:environment] == 'staging'
-
-    build_instrumented_tests_packages({
-      app: options[:app]
-    }) if !options[:app].ui_test_scheme.nil? && options[:environment] == 'production'
   end
 
   desc "Package Instrumented Tests for a Sample App"