diff --git a/.github/workflows/swift-debug-macos.yml b/.github/workflows/swift-debug-macos.yml
index db5709b8e..ac3e491b0 100644
--- a/.github/workflows/swift-debug-macos.yml
+++ b/.github/workflows/swift-debug-macos.yml
@@ -1,4 +1,4 @@
-name: Run Tests (macOS arm64)
+name: Build Debug (macOS arm64)
 
 on: [push]
 
@@ -7,10 +7,15 @@ jobs:
     name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [self-hosted]
+        os: [macos-latest]
         swift: ["5.10"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: 🧪 Test
-        run: swift test
+      - name: 🦦 Install Swift Bundler
+        run: |
+          curl -o swift-bundler -L https://github.com/wabiverse/wabi-swift-bundler/releases/download/v3.0.0/swift-bundler
+          chmod +x ./swift-bundler
+          cp ./swift-bundler /usr/local/bin
+      - name: 📦 Build & Bundle
+        run: ./swift-bundler bundle -c debug --xcodebuild
diff --git a/.github/workflows/swift-ios.yml b/.github/workflows/swift-ios.yml
index 682a235de..6b83aed2d 100644
--- a/.github/workflows/swift-ios.yml
+++ b/.github/workflows/swift-ios.yml
@@ -7,10 +7,15 @@ jobs:
     name: Swift ${{ matrix.swift }} on iOS
     strategy:
       matrix:
-        os: [self-hosted]
+        os: [macos-latest]
         swift: ["5.10"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: 📦 Build
-        run: swift bundler bundle -c release -p iOSSimulator UsdView
+      - name: 🦦 Install Swift Bundler
+        run: |
+          curl -o swift-bundler -L https://github.com/wabiverse/wabi-swift-bundler/releases/download/v3.0.0/swift-bundler
+          chmod +x ./swift-bundler
+          cp ./swift-bundler /usr/local/bin
+      - name: 📦 Build & Bundle
+        run: ./swift-bundler bundle -c release -p iOSSimulator UsdView
diff --git a/.github/workflows/swift-macos.yml b/.github/workflows/swift-macos.yml
index 46154c2cb..eb16a9f6b 100644
--- a/.github/workflows/swift-macos.yml
+++ b/.github/workflows/swift-macos.yml
@@ -7,10 +7,15 @@ jobs:
     name: Swift ${{ matrix.swift }} on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [self-hosted]
+        os: [macos-latest]
         swift: ["5.10"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: 📦 Build
-        run: swift build -c release --target UsdView
+      - name: 🦦 Install Swift Bundler
+        run: |
+          curl -o swift-bundler -L https://github.com/wabiverse/wabi-swift-bundler/releases/download/v3.0.0/swift-bundler
+          chmod +x ./swift-bundler
+          cp ./swift-bundler /usr/local/bin
+      - name: 📦 Build & Bundle
+        run: ./swift-bundler bundle -c release --xcodebuild
diff --git a/.github/workflows/swift-visionos.yml b/.github/workflows/swift-visionos.yml
index 89018cb09..e2fdeb86f 100644
--- a/.github/workflows/swift-visionos.yml
+++ b/.github/workflows/swift-visionos.yml
@@ -7,10 +7,15 @@ jobs:
     name: Swift ${{ matrix.swift }} on visionOS
     strategy:
       matrix:
-        os: [self-hosted]
+        os: [macos-latest]
         swift: ["5.10"]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: 📦 Build
-        run: swift bundler bundle -c release -p visionOSSimulator UsdView
+      - name: 🦦 Install Swift Bundler
+        run: |
+          curl -o swift-bundler -L https://github.com/wabiverse/wabi-swift-bundler/releases/download/v3.0.0/swift-bundler
+          chmod +x ./swift-bundler
+          cp ./swift-bundler /usr/local/bin
+      - name: 📦 Build & Bundle
+        run: ./swift-bundler bundle -c release -p visionOSSimulator UsdView