diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e4edfc7d..a7a8b22a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -106,27 +106,28 @@ jobs:
           -sdk iphonesimulator
 
   swiftpm:
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: macos-13
     env:
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     strategy:
       fail-fast: false
       matrix:
+        version: [17.2]
+        platform: [iphoneos, iphonesimulator]
+        arch: [x86_64, arm64]
         include:
           # 17.2
-          - target: "x86_64-apple-ios17.2-simulator"
-            xcode: "15.2"
-            runs-on: macos-13
-          - target: "arm64-apple-ios17.2-simulator"
-            xcode: "15.2"
-            runs-on: macos-13
+          - platform: iphoneos
+            sys: "ios17.2"
+          - platform: iphonesimulator
+            sys: "ios17.2-simulator"
     steps:
     - uses: actions/checkout@v3
     - name: "Swift Package Manager build"
       run: |
         xcrun swift build \
-          --sdk "$(xcrun --sdk iphonesimulator --show-sdk-path)" \
-          -Xswiftc "-target" -Xswiftc "${{ matrix.target }}"
+          --sdk "$(xcrun --sdk ${{ matrix.platform }} --show-sdk-path)" \
+          -Xswiftc "-target" -Xswiftc "${{ matrix.arch }}-apple-${{ matrix.sys }}"
 
   swiftpm_old:
     runs-on: ${{ matrix.runs-on }}
@@ -136,13 +137,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # 15.7
-          - target: "x86_64-apple-ios15.7-simulator"
-            xcode: "14.1"
-            runs-on: macos-12
-          - target: "arm64-apple-ios15.7-simulator"
-            xcode: "14.1"
-            runs-on: macos-12
           # 16.4
           - target: "x86_64-apple-ios16.4-simulator"
             xcode: "14.3.1"
@@ -150,10 +144,20 @@ jobs:
           - target: "arm64-apple-ios16.4-simulator"
             xcode: "14.3.1"
             runs-on: macos-13
+          # 15.7
+          - target: "x86_64-apple-ios15.7-simulator"
+            xcode: "14.1"
+            runs-on: macos-12
+          - target: "arm64-apple-ios15.7-simulator"
+            xcode: "14.1"
+            runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: "Swift Package Manager build"
-      run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "${{ matrix.target }}"
+      run: |
+        swift build \
+          -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" \
+          -Xswiftc "-target" -Xswiftc "${{ matrix.target }}"
 
   carthage:
     if: false