diff --git a/.github/workflows/deploy_docc.yml b/.github/workflows/deploy_docc.yml
index 24b5f9f..ba5edcb 100644
--- a/.github/workflows/deploy_docc.yml
+++ b/.github/workflows/deploy_docc.yml
@@ -20,11 +20,11 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
 
-    runs-on: macos-12
+    runs-on: macos-15
 
     steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Build DocC
         run: |
@@ -38,10 +38,10 @@ jobs:
             --output-path docs;
 
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'docs'
 
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
\ No newline at end of file
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c3fdf68..06a8bb7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,5 @@
 name: build
 
-# Controls when the action will run. 
 on:
   push:
     branches:
@@ -13,15 +12,12 @@ on:
 jobs:
   build:
     name: Build and Test project
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Init
       run: |
         make init
-    - name: Force xcode 14.3.1
-      run: |
-        sudo xcode-select -switch /Applications/Xcode_14.3.1.app
     - name: Build
       run: |
         make build
@@ -33,4 +29,4 @@ jobs:
         make test
     - name: Example Build
       run: |
-        make example_build
\ No newline at end of file
+        make example_build
diff --git a/Makefile b/Makefile
index 530d224..926845d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 
 init:
-	# Install bundler if not installed
-	if ! gem spec bundler > /dev/null 2>&1; then\
-  		echo "bundler gem is not installed!";\
-  		-sudo gem install bundler -v "1.17.3";\
-	fi
-	-bundle config set --local path '.bundle'
-	-bundle update
+	bundle config set --local path '.bundle'
+	bundle install
 
 build:
 	xcodebuild clean build -scheme DebugScreen -sdk iphonesimulator | bundle exec xcpretty -c
 
 spm_build:
 	swift package clean
-	swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios15.5-simulator" -Xswiftc "-lswiftUIKit"
+	swift build \
+		-Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" \
+		-Xswiftc "-target" -Xswiftc "arm64-apple-ios`xcrun --sdk iphonesimulator --show-sdk-version`-simulator" \
+		-Xcc "-isysroot" -Xcc "`xcrun --sdk iphonesimulator --show-sdk-path`" \
+		-Xcc "-target" -Xcc "arm64-apple-ios`xcrun --sdk iphonesimulator --show-sdk-version`-simulator" \
+		-Xswiftc "-lswiftUIKit"
 
 test:
-	xcodebuild test -scheme DebugScreen -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -enableCodeCoverage YES -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.5' | bundle exec xcpretty -c
+	xcodebuild test -scheme DebugScreen -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -enableCodeCoverage YES -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' | bundle exec xcpretty -c
 
 example_build:
 	xcodebuild clean build -scheme DebugScreenExample -sdk iphonesimulator | bundle exec xcpretty -c