diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 607fb374d..e7009e84e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -116,10 +116,12 @@ jobs:
           - name: iOS 17, iPhone 16
             script: test:ios
             iosVersion: 17
+            deviceModel: iPhone 16
             developerDir: CI_XCODE_16
           - name: iOS 18, iPhone 16
             script: test:ios
             iosVersion: 18
+            deviceModel: iPhone 16
             developerDir: CI_XCODE_16
           - name: macOS 14
             script: test:macos
diff --git a/Rakefile b/Rakefile
index d20ea4123..d26aa04a6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,7 +12,7 @@ require_relative 'Vendor/xctoolchain/Scripts/xctask/build_task'
 SCRIPT_PATH = File.expand_path(File.dirname(__FILE__))
 starters_path = File.join(SCRIPT_PATH, 'ParseStarterProject')
 
-ios_simulator = 'platform="iOS Simulator",name="iPhone 16",OS=#{ENV["IOS_VERSION"]}'
+ios_simulator = "platform=\"iOS Simulator\",name=\"iPhone 16\",OS=#{ENV['IOS_VERSION'] || '17.0'}"
 tvos_simulator = 'platform="tvOS Simulator",name="Apple TV"'
 watchos_simulator = 'platform="watchOS Simulator",name="Apple Watch Series 10 (46mm)"'