diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d24c2ba..1f09b9dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,7 +52,7 @@ jobs:
     runs-on: [self-hosted, macos, arm64]
     defaults:
       run:
-        working-directory: platform
+        working-directory: workspace-server
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -66,7 +66,7 @@ jobs:
         uses: golangci/golangci-lint-action@v4
         with:
           version: latest
-          working-directory: platform
+          working-directory: workspace-server
           args: --timeout 3m
         continue-on-error: true  # Warn but don't block until codebase is clean
       - name: Run tests with race detection and coverage
@@ -129,10 +129,8 @@ jobs:
     name: Canvas Deploy Reminder
     runs-on: [self-hosted, macos, arm64]
     needs: [changes, canvas-build]
-    if: needs.changes.outputs.canvas == 'true'
-    # Only fires on direct pushes to main (i.e. after a PR merges).
-    # PRs get canvas-build CI but no reminder — no deployment happens on PRs.
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    # Only fires on direct pushes to main (i.e. after staging→main promotion).
+    if: needs.changes.outputs.canvas == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
     permissions:
       # Required to post commit comments via the GitHub API.
       contents: write
@@ -178,7 +176,7 @@ jobs:
     runs-on: [self-hosted, macos, arm64]
     defaults:
       run:
-        working-directory: workspace-template
+        working-directory: workspace
     steps:
       - uses: actions/checkout@v4
       # setup-python@v5 cannot write to /Users/runner (GitHub-hosted path) on
diff --git a/.github/workflows/e2e-api.yml b/.github/workflows/e2e-api.yml
index 482e186a..24ee0a11 100644
--- a/.github/workflows/e2e-api.yml
+++ b/.github/workflows/e2e-api.yml
@@ -88,10 +88,10 @@ jobs:
           echo "::error::Redis did not become ready in 15s"
           exit 1
       - name: Build platform
-        working-directory: platform
+        working-directory: workspace-server
         run: go build -o platform-server ./cmd/server
       - name: Start platform (background)
-        working-directory: platform
+        working-directory: workspace-server
         run: |
           ./platform-server > platform.log 2>&1 &
           echo $! > platform.pid