diff --git a/.gcp/maintainer-worker.yml b/.gcp/maintainer-worker.yml
index 7ca97ef124..553235f1af 100644
--- a/.gcp/maintainer-worker.yml
+++ b/.gcp/maintainer-worker.yml
@@ -26,22 +26,24 @@ steps:
       - |-
         IMAGE_BASE="us-docker.pkg.dev/gemini-code-dev/gemini-cli/maintainer"
         
-        # Sanitize branch name (lowercase, replace non-alphanumeric with -)
-        # Handles both _HEAD_BRANCH (PRs) and BRANCH_NAME (Pushes)
+        # Determine the primary tag (branch name or 'latest' for main)
         RAW_BRANCH="${_HEAD_BRANCH:-${BRANCH_NAME}}"
-        CLEAN_BRANCH=$(echo "$${RAW_BRANCH}" | sed 's/[^a-zA-Z0-9]/-/g' | tr '[:upper:]' '[:lower:]')
+        if [ "$${RAW_BRANCH}" == "main" ]; then
+          TAG_PRIMARY="latest"
+        else
+          TAG_PRIMARY=$(echo "$${RAW_BRANCH}" | sed 's/[^a-zA-Z0-9]/-/g' | tr '[:upper:]' '[:lower:]')
+        fi
         
         TAG_SHA="${SHORT_SHA}"
-        TAG_BRANCH="$${CLEAN_BRANCH}"
         
-        echo "📦 Building Maintainer Image for branch: $${RAW_BRANCH} ($${CLEAN_BRANCH})"
+        echo "📦 Building Maintainer Image for: $${RAW_BRANCH} -> $${TAG_PRIMARY}"
         
         docker build -f .gcp/Dockerfile.maintainer \
           -t "$${IMAGE_BASE}:$${TAG_SHA}" \
-          -t "$${IMAGE_BASE}:$${TAG_BRANCH}" .
+          -t "$${IMAGE_BASE}:$${TAG_PRIMARY}" .
           
         docker push "$${IMAGE_BASE}:$${TAG_SHA}"
-        docker push "$${IMAGE_BASE}:$${TAG_BRANCH}"
+        docker push "$${IMAGE_BASE}:$${TAG_PRIMARY}"
 
 options:
   defaultLogsBucketBehavior: 'REGIONAL_USER_OWNED_BUCKET'
diff --git a/.gemini/skills/offload/NEXT_MISSION.md b/.gemini/skills/offload/NEXT_MISSION.md
index 25ffeb7f8b..a53b863d28 100644
--- a/.gemini/skills/offload/NEXT_MISSION.md
+++ b/.gemini/skills/offload/NEXT_MISSION.md
@@ -13,22 +13,30 @@ Shift from a "Manual VM" to an "Invisible VM" (Container-Optimized OS) that runs
    - Optimize `.gcp/Dockerfile.maintainer` to include `tsx`, `vitest`, `gh`, and system dependencies (`libsecret`, `build-essential`).
    - *Verified locally: Node v20, GH CLI, Git, TSX, and Vitest are functional with required headers.*
 2. **Dedicated Pipeline**:
-   - Use `.gcp/maintainer-worker.yml` for isolated PR builds.
-   - **Tagging Strategy**: Dual-tag images with `${SHORT_SHA}` (immutable) and `${CLEAN_BRANCH}` (latest-on-branch).
+   - Use `.gcp/maintainer-worker.yml` for isolated builds.
+   - **Tagging Strategy**: 
+     - `latest`: Automatically updated on every merge to `main`.
+     - `branch-name`: Created on-demand for PRs via `/gcbrun` comment.
 3. **Setup Script (`setup.ts`)**:
    - Refactor `provision` to use `gcloud compute instances create-with-container`.
    - Point to the new `maintainer` image in Artifact Registry.
 4. **Orchestrator (`orchestrator.ts`)**:
    - Update SSH logic to include the `--container` flag.
 
-## GCP Console Setup (Manual Action)
-To enable the automatic maintainer image builds on PRs:
-1. **Create Trigger**: Go to **Cloud Build > Triggers** and create a new trigger.
-2. **Event**: Set to **Pull Request**.
-3. **Source**: Select the `google-gemini/gemini-cli` repository.
-4. **Configuration**: Point to `.gcp/maintainer-worker.yml` in the repo.
-5. **Filters**: Set the base branch to `^main$`.
-6. **Service Account**: Ensure it has `Artifact Registry Writer` permissions.
+## GCP Console Setup (Two Triggers)
+
+### Trigger 1: Production Maintainer Image (Automatic)
+1. **Event**: Push to branch.
+2. **Branch**: `^main$`.
+3. **Configuration**: Point to `.gcp/maintainer-worker.yml`.
+4. **Purpose**: Keeps the stable "Golden Image" up to date for daily use.
+
+### Trigger 2: On-Demand Testing (Comment-Gated)
+1. **Event**: Pull request.
+2. **Base Branch**: `^main$`.
+3. **Comment Control**: Set to **"Required"** (e.g. `/gcbrun`).
+4. **Configuration**: Point to `.gcp/maintainer-worker.yml`.
+5. **Purpose**: Allows developers to test infrastructure changes before merging.
 
 ## How to Resume
 1. Load the checkpoint: `/checkpoint save offload-container-refactor` (if available).