diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index afe776bd..c2d3b1c6 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -121,7 +121,7 @@ jobs:
       run: |
         echo "Resolving Swift package dependencies..."
         # Workspace is at root level
-        xcodebuild -resolvePackageDependencies -workspace VibeTunnel.xcworkspace -scheme VibeTunnel-Mac || echo "Dependency resolution completed"
+        xcodebuild -resolvePackageDependencies -workspace VibeTunnel.xcworkspace -scheme VibeTunnel || echo "Dependency resolution completed"
         
         # Debug: List available schemes
         echo "=== Available schemes ==="
@@ -139,7 +139,7 @@ jobs:
         
         set -o pipefail && xcodebuild build \
           -workspace VibeTunnel.xcworkspace \
-          -scheme VibeTunnel-Mac \
+          -scheme VibeTunnel \
           -configuration $BUILD_CONFIG \
           -destination "platform=macOS" \
           -showBuildTimingSummary \
@@ -195,7 +195,7 @@ jobs:
         set -o pipefail && \
         xcodebuild test \
           -workspace VibeTunnel.xcworkspace \
-          -scheme VibeTunnel-Mac \
+          -scheme VibeTunnel \
           -configuration $TEST_CONFIG \
           -destination "platform=macOS" \
           -enableCodeCoverage $ENABLE_COVERAGE \
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5d28bd3f..8b8f1bdc 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -149,7 +149,7 @@ jobs:
         set -o pipefail && \
         xcodebuild build \
           -workspace VibeTunnel.xcworkspace \
-          -scheme VibeTunnel-Mac \
+          -scheme VibeTunnel \
           -configuration Release \
           -destination "generic/platform=macOS" \
           -archivePath build/VibeTunnel.xcarchive \
@@ -175,7 +175,7 @@ jobs:
         set -o pipefail && \
         xcodebuild test \
           -workspace VibeTunnel.xcworkspace \
-          -scheme VibeTunnel-Mac \
+          -scheme VibeTunnel \
           -configuration Release \
           -destination "platform=macOS" \
           -enableCodeCoverage YES \