diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index aa510cd..afca9e3 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -8,10 +8,13 @@ on:
 jobs:
   parallel-testing:
     name: Cloned simulator
-    runs-on: self-hosted 
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: maxim-lobanov/setup-xcode@v1.6.0
+        with:
+          xcode-version: latest-stable
       - name: Build & Test
         run: |
           make test-parallel
@@ -41,15 +44,18 @@ jobs:
       #     path: Client/logfile.txt
   single-device-testing:
     name: Normal simulator
-    runs-on: self-hosted 
+    runs-on: macos-latest 
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: maxim-lobanov/setup-xcode@v1.6.0
+        with:
+          xcode-version: latest-stable
       - name: Build & Test
         timeout-minutes: 20
         run: |
           #run UIUnitTest server
-          make test
+          make test.ci
       # - name: Archive cli logs
       #   if: always()
       #   uses: actions/upload-artifact@v3
diff --git a/makefile b/makefile
index f77617a..6183a2d 100644
--- a/makefile
+++ b/makefile
@@ -7,12 +7,26 @@ test:
 	set -o pipefail && xcodebuild -project Client/Client.xcodeproj \
 		-scheme Client \
 		test \
-		-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' \
+		-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' \
 		-resultBundlePath test-result.xcresult \
 		-derivedDataPath 'derivedData' \
 		-clonedSourcePackagesDirPath SourcePackages \
 		-disableAutomaticPackageResolution | xcbeautify --report junit
 
+.PHONY: test.ci
+test.ci:	
+	$(MAKE) clean-up
+	$(MAKE) generate-zip
+	set -o pipefail && xcodebuild -project Client/Client.xcodeproj \
+		-scheme Client \
+		test \
+		-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' \
+		-resultBundlePath test-result.xcresult \
+		-derivedDataPath 'derivedData' \
+		-clonedSourcePackagesDirPath SourcePackages \
+		-disableAutomaticPackageResolution | xcbeautify --report junit
+
+
 .PHONY: test-parallel
 test-parallel:
 	$(MAKE) clean-up
@@ -20,7 +34,7 @@ test-parallel:
 	NSUnbufferedIO=YES xcodebuild -project Client/Client.xcodeproj \
 	  -scheme "ClientTests - Parallel" \
 		test \
-		-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0' \
+		-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.2' \
 		-resultBundlePath test-result.xcresult \
 		-clonedSourcePackagesDirPath SourcePackages \
 		-disableAutomaticPackageResolution \
@@ -35,7 +49,7 @@ generate-zip:
 	(cd $(root)/Server/ && zip -r $(root)/Lib/Sources/UIUnitTestCLI/resources/Server.zip *) || exit 1
 	xcodebuild -project ./Server/Server.xcodeproj \
 	  -scheme ServerUITests -sdk iphonesimulator \
-	  -destination "platform=iOS Simulator,name=iPhone 16,OS=18.0" \
+	  -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" \
 	  -IDEBuildLocationStyle=Custom \
 	  -IDECustomBuildLocationType=Absolute \
 	  -IDECustomBuildProductsPath="$(root)/build/Products" \