diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ddd4f8..b09ae20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,10 +9,19 @@ on:
   pull_request:
     branches: [ "main" ]
 
+env:
+  PACKAGE: MapItemPicker
+
 jobs:
-  iOS:
+  ios:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Build
-      run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild build-for-testing -scheme MapItemPicker -destination "platform=iOS Simulator,OS=latest,name=iPhone 14" | xcpretty
+    - uses: actions/checkout@v4
+    - name: Setup Xcode 16
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: 16
+    - name: Build (iOS)
+      run: xcodebuild build -scheme $PACKAGE -sdk iphoneos -destination 'generic/platform=iOS,name=iPhone 15'
+    - name: Test (iOS)
+      run: xcodebuild test -scheme $PACKAGE -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15'
diff --git a/README.md b/README.md
index 501d3e5..4be2849 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # MapItemPicker 🗺️📍
 
 [![GithubCI_Status]][GithubCI_URL]
-[![Quintschaf_Badge]](https://quintschaf.com)
+[![FiveSheep_Badge]](https://fivesheep.co)
 [![LICENSE_BADGE]][LICENSE_URL]
 
 MapItemPicker is a simple, yet highly customizable and powerful location picker for SwiftUI.
@@ -115,8 +115,8 @@ MapItemPicker contains localizations for categories, titles of sections in the v
 
 <!-- References -->
 
-[GithubCI_Status]: https://github.com/quintschaf/MapItemPicker/actions/workflows/ci.yml/badge.svg?branch=main
-[GithubCI_URL]: https://github.com/quintschaf/MapItemPicker/actions/workflows/ci.yml
-[Quintschaf_Badge]: https://badgen.net/badge/Built%20and%20maintained%20by/Quintschaf/cyan?icon=https://quintschaf.com/assets/logo.svg
-[LICENSE_BADGE]: https://badgen.net/github/license/Quintschaf/MapItemPicker
-[LICENSE_URL]: https://github.com/Quintschaf/MapItemPicker/blob/master/LICENSE
+[GithubCI_Status]: https://github.com/FiveSheepCo/MapItemPicker/actions/workflows/ci.yml/badge.svg?branch=main
+[GithubCI_URL]: https://github.com/FiveSheepCo/MapItemPicker/actions/workflows/ci.yml
+[FiveSheep_Badge]: https://badgen.net/badge/Built%20and%20maintained%20by/FiveSheep/cyan
+[LICENSE_BADGE]: https://badgen.net/github/license/FiveSheepCo/MapItemPicker
+[LICENSE_URL]: https://github.com/FiveSheepCo/MapItemPicker/blob/master/LICENSE