diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 2cfd928f..74bb66bd 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -55,13 +55,13 @@ steps:
               - "logs/*"
       - label: "iOS 13 Unit Tests"
         commands:
-          - ./scripts/run-unit-tests.sh PLATFORM=iOS OS=13.0
+          - ./scripts/run-unit-tests.sh PLATFORM=iOS OS=13.7
         plugins:
           artifacts#v1.5.0:
             upload:
               - "logs/*"
         agents:
-          queue: macos-11
+          queue: macos-12-arm
 
   - group: ":iphone: E2E Tests"
     steps:
diff --git a/Makefile b/Makefile
index ea3b7f16..8959404f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ else
  else
   ifeq ($(PLATFORM),iOS)
    SDK?=iphonesimulator
-   DEVICE?=iPhone 8
+   DEVICE?=iPhone 11
    DESTINATION?=platform=iOS Simulator,name=$(DEVICE),OS=$(OS)
    RELEASE_DIR=Release-iphoneos
   else