diff --git a/backend/routers/auto_optimize.py b/backend/routers/auto_optimize.py
index 1b5bad49b..ff5255226 100644
--- a/backend/routers/auto_optimize.py
+++ b/backend/routers/auto_optimize.py
@@ -61,6 +61,8 @@ class TriggerRequest(BaseModel):
     apply_mode: str = "genie_config"
     levers: list[int] | None = None
     deploy_target: str | None = None
+    deploy_space_id: str | None = None
+    catalog_map: dict[str, str] | None = None
 
 
 class SchemaAccessStatus(BaseModel):
@@ -857,6 +859,8 @@ async def trigger(body: TriggerRequest, request: Request):
             apply_mode=body.apply_mode,
             levers=body.levers,
             deploy_target=body.deploy_target,
+            deploy_space_id=body.deploy_space_id,
+            catalog_map=body.catalog_map,
         )
         return {
             "runId": result.run_id,
@@ -879,6 +883,101 @@ async def trigger(body: TriggerRequest, request: Request):
         raise HTTPException(status_code=500, detail="Failed to start optimization job.")
 
 
+class DeployRequest(BaseModel):
+    target_workspace_url: str
+    target_space_id: str | None = None
+    catalog_map: dict[str, str] | None = None
+
+
+@router.post("/spaces/{space_id}/deploy")
+async def deploy_space(space_id: str, body: DeployRequest):
+    """Deploy a Genie Space config to a target workspace.
+
+    Fetches the current space config, applies catalog remapping, and
+    PATCHes it to the target workspace. No UC model or optimization run
+    required — works with any Genie Space.
+    """
+    import json as _json
+
+    # 1. Fetch source space config
+    try:
+        from backend.services.genie_client import get_serialized_space
+        space_config = get_serialized_space(genie_space_id=space_id)
+    except Exception as e:
+        raise HTTPException(status_code=400, detail=f"Failed to fetch space config: {e}")
+
+    # 2. Apply catalog remapping
+    if body.catalog_map:
+        remapped = 0
+        for key in ("tables", "metric_views"):
+            for src in space_config.get("data_sources", {}).get(key, []):
+                ident = src.get("identifier", "")
+                parts = ident.replace("`", "").split(".")
+                if len(parts) >= 3 and parts[0] in body.catalog_map:
+                    parts[0] = body.catalog_map[parts[0]]
+                    src["identifier"] = ".".join(parts)
+                    remapped += 1
+        logger.info("Remapped %d catalog references for deploy", remapped)
+
+    # 3. Connect to target workspace using the app's SP credentials.
+    #    The SP must be registered in the target workspace.
+    try:
+        from databricks.sdk import WorkspaceClient
+        sp_ws = get_service_principal_client()
+        target_ws = WorkspaceClient(
+            host=body.target_workspace_url.rstrip("/"),
+            client_id=sp_ws.config.client_id,
+            client_secret=sp_ws.config.client_secret,
+        )
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"Failed to connect to target workspace: {e}")
+
+    # 4. Deploy: PATCH existing space or CREATE new one
+    try:
+        if body.target_space_id:
+            # Update existing space
+            from genie_space_optimizer.common.genie_client import patch_space_config
+            patch_space_config(target_ws, body.target_space_id, space_config)
+            target_space = body.target_space_id
+            logger.info("PATCHed existing space %s in target workspace", target_space)
+        else:
+            # Create new space in target workspace
+            from backend.services.genie_client import get_genie_space
+            source_space = get_genie_space(genie_space_id=space_id)
+            display_name = source_space.get("title", "Deployed Genie Space")
+
+            # Find a warehouse in the target workspace
+            warehouses = list(target_ws.warehouses.list())
+            if not warehouses:
+                raise ValueError("No SQL warehouse found in target workspace")
+            target_warehouse_id = warehouses[0].id
+
+            response = target_ws.api_client.do(
+                method="POST",
+                path="/api/2.0/genie/spaces",
+                body={
+                    "title": display_name,
+                    "description": f"Deployed from source workspace (space {space_id})",
+                    "parent_path": "/Shared/",
+                    "warehouse_id": target_warehouse_id,
+                    "serialized_space": _json.dumps(space_config),
+                },
+            )
+            target_space = response.get("space_id", "")
+            logger.info("Created new space %s in target workspace", target_space)
+
+        target_host = body.target_workspace_url.rstrip("/")
+        return {
+            "status": "DEPLOYED",
+            "targetSpaceId": target_space,
+            "targetUrl": target_host,
+            "spaceUrl": f"{target_host}/genie/rooms/{target_space}",
+        }
+    except Exception as e:
+        logger.exception("Failed to deploy to target workspace: %s", e)
+        raise HTTPException(status_code=500, detail=f"Deployment failed: {e}")
+
+
 # ---------------------------------------------------------------------------
 # Pipeline step definitions — group raw sub-stages into 6 logical steps
 # (Ported from Genie Space Optimizer's map_stages_to_steps)
@@ -1162,6 +1261,7 @@ async def get_run(run_id: RunId):
         "levers": levers,
         "links": links,
         "convergenceReason": run.get("convergence_reason"),
+        "deployTarget": run.get("deploy_target") or None,
         "deploymentStatus": run.get("deploy_status"),
         "labelingSessionUrl": run.get("labeling_session_url") or None,
         "labelingSessionName": run.get("labeling_session_name") or None,
diff --git a/frontend/src/components/auto-optimize/RunDetailView.tsx b/frontend/src/components/auto-optimize/RunDetailView.tsx
index a4fdb67a7..b8585933e 100644
--- a/frontend/src/components/auto-optimize/RunDetailView.tsx
+++ b/frontend/src/components/auto-optimize/RunDetailView.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react"
-import { ArrowLeft, Cog, UserCheck, ExternalLink } from "lucide-react"
+import { ArrowLeft, Cog, UserCheck, ExternalLink, CheckCircle2, Clock, AlertTriangle } from "lucide-react"
 import { Card, CardContent } from "@/components/ui/card"
 import { Badge } from "@/components/ui/badge"
 import { ScoreSummary } from "@/components/auto-optimize/ScoreSummary"
@@ -157,6 +157,45 @@ export function RunDetailView({ runId, onBack }: RunDetailViewProps) {
         </div>
       )}
 
+      {/* Deployment Status Banner (when already deployed) */}
+      {run.deployTarget && run.deploymentStatus && (
+        <div className={`flex items-start gap-3 rounded-lg border px-4 py-3 ${
+          run.deploymentStatus === "DEPLOYED"
+            ? "border-emerald-500/30 bg-emerald-500/5"
+            : run.deploymentStatus === "FAILED"
+              ? "border-red-500/30 bg-red-500/5"
+              : "border-blue-500/30 bg-blue-500/5"
+        }`}>
+          {run.deploymentStatus === "DEPLOYED" ? (
+            <CheckCircle2 className="mt-0.5 h-5 w-5 text-emerald-600 shrink-0" />
+          ) : run.deploymentStatus === "FAILED" ? (
+            <AlertTriangle className="mt-0.5 h-5 w-5 text-red-600 shrink-0" />
+          ) : (
+            <Clock className="mt-0.5 h-5 w-5 text-blue-600 shrink-0" />
+          )}
+          <div className="flex-1">
+            <h3 className={`text-sm font-semibold ${
+              run.deploymentStatus === "DEPLOYED" ? "text-emerald-900 dark:text-emerald-300"
+                : run.deploymentStatus === "FAILED" ? "text-red-900 dark:text-red-300"
+                : "text-blue-900 dark:text-blue-300"
+            }`}>
+              {run.deploymentStatus === "DEPLOYED" ? "Deployed to target workspace"
+                : run.deploymentStatus === "PENDING_APPROVAL" ? "Deployment awaiting approval"
+                : run.deploymentStatus === "FAILED" ? "Deployment failed"
+                : `Deployment: ${run.deploymentStatus}`}
+            </h3>
+            <p className="mt-0.5 text-xs text-muted">Target: {run.deployTarget}</p>
+          </div>
+          {run.deploymentStatus === "DEPLOYED" && (
+            <a href={run.deployTarget} target="_blank" rel="noopener noreferrer"
+              className="shrink-0 inline-flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium rounded-md border border-emerald-500/30 text-emerald-700 dark:text-emerald-300 hover:bg-emerald-500/10 transition-colors">
+              Open Workspace <ExternalLink className="h-3.5 w-3.5" />
+            </a>
+          )}
+        </div>
+      )}
+
+
       {/* Tabs */}
       <div className="flex gap-1 border-b border-default">
         <button
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index d586bad3e..70bb35caf 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -407,6 +407,21 @@ export async function triggerAutoOptimize(request: GSOTriggerRequest): Promise<G
   )
 }
 
+export async function deploySpace(
+  spaceId: string,
+  config: { target_workspace_url: string; target_space_id?: string; catalog_map?: Record<string, string> }
+): Promise<{ status: string; targetSpaceId: string; targetUrl: string; spaceUrl?: string }> {
+  return fetchWithTimeout<{ status: string; targetSpaceId: string; targetUrl: string; spaceUrl?: string }>(
+    `${API_BASE}/auto-optimize/spaces/${spaceId}/deploy`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(config),
+    },
+    LONG_TIMEOUT
+  )
+}
+
 export async function getAutoOptimizeRun(runId: string): Promise<GSOPipelineRun> {
   return fetchWithTimeout<GSOPipelineRun>(`${API_BASE}/auto-optimize/runs/${runId}`)
 }
diff --git a/frontend/src/pages/DeployTab.tsx b/frontend/src/pages/DeployTab.tsx
new file mode 100644
index 000000000..d3fc02ac3
--- /dev/null
+++ b/frontend/src/pages/DeployTab.tsx
@@ -0,0 +1,225 @@
+/**
+ * DeployTab — Cross-workspace deployment for Genie Spaces.
+ * Deploys the current space config to a target workspace with optional catalog remapping.
+ * Settings are remembered via localStorage.
+ */
+import { useState, useEffect } from "react"
+import { CheckCircle2, ExternalLink, Plus, Rocket, Trash2, Upload } from "lucide-react"
+import { Card, CardHeader, CardTitle, CardContent } from "@/components/ui/card"
+import { deploySpace } from "@/lib/api"
+
+const DEPLOY_STORAGE_KEY = "genie-workbench:deploy-config"
+
+interface DeployConfig {
+  targetUrl: string
+  spaceId: string
+  catalogMappings: { source: string; target: string }[]
+}
+
+function loadDeployConfig(): DeployConfig {
+  try {
+    const raw = localStorage.getItem(DEPLOY_STORAGE_KEY)
+    if (raw) return JSON.parse(raw)
+  } catch {}
+  return { targetUrl: "", spaceId: "", catalogMappings: [] }
+}
+
+function saveDeployConfig(config: DeployConfig) {
+  localStorage.setItem(DEPLOY_STORAGE_KEY, JSON.stringify(config))
+}
+
+interface DeployTabProps {
+  spaceId: string
+}
+
+export function DeployTab({ spaceId }: DeployTabProps) {
+  const [targetUrl, setTargetUrl] = useState("")
+  const [targetSpaceId, setTargetSpaceId] = useState("")
+  const [catalogMappings, setCatalogMappings] = useState<{ source: string; target: string }[]>([])
+
+  const [deploying, setDeploying] = useState(false)
+  const [deployError, setDeployError] = useState<string | null>(null)
+  const [deploySuccess, setDeploySuccess] = useState<{ targetUrl: string; targetSpaceId: string; spaceUrl?: string } | null>(null)
+
+  // Load config from localStorage on mount
+  useEffect(() => {
+    const saved = loadDeployConfig()
+    setTargetUrl(saved.targetUrl)
+    setTargetSpaceId(saved.spaceId)
+    setCatalogMappings(saved.catalogMappings)
+  }, [])
+
+  async function handleDeploy() {
+    if (!targetUrl.trim()) return
+    setDeploying(true)
+    setDeployError(null)
+    setDeploySuccess(null)
+
+    const catalogMap = catalogMappings.reduce<Record<string, string>>((acc, m) => {
+      if (m.source.trim() && m.target.trim()) acc[m.source.trim()] = m.target.trim()
+      return acc
+    }, {})
+
+    try {
+      const result = await deploySpace(spaceId, {
+        target_workspace_url: targetUrl.trim(),
+        target_space_id: targetSpaceId.trim() || undefined,
+        catalog_map: Object.keys(catalogMap).length > 0 ? catalogMap : undefined,
+      })
+      saveDeployConfig({ targetUrl: targetUrl.trim(), spaceId: targetSpaceId.trim(), catalogMappings })
+      setDeploySuccess({ targetUrl: result.targetUrl, targetSpaceId: result.targetSpaceId, spaceUrl: result.spaceUrl })
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : typeof e === "object" ? JSON.stringify(e) : String(e)
+      setDeployError(msg || "Deployment failed")
+    } finally {
+      setDeploying(false)
+    }
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Deployment Config */}
+      <Card>
+        <CardHeader>
+          <CardTitle className="flex items-center gap-2">
+            <Upload className="w-5 h-5" />
+            Deploy to Workspace
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          <p className="text-xs text-muted">
+            Deploy this Genie Space's current config to a target workspace. Catalog references are remapped automatically. Settings are remembered for next time.
+          </p>
+
+          <div className="rounded-lg bg-surface-secondary border border-default px-4 py-3 text-xs text-muted space-y-1">
+            <p className="font-medium text-secondary">Prerequisites</p>
+            <ul className="list-disc ml-4 space-y-0.5">
+              <li>The app's service principal must be registered in the target workspace</li>
+              <li>The SP needs permission to create Genie Spaces (or CAN_MANAGE on the target space if updating)</li>
+              <li>The referenced catalogs must be accessible from the target workspace (shared metastore, or configured in target metastore)</li>
+              <li>The SP needs <code className="text-accent">USE_CATALOG</code>, <code className="text-accent">USE_SCHEMA</code>, and <code className="text-accent">SELECT</code> on the referenced tables</li>
+            </ul>
+          </div>
+
+          <div className="grid grid-cols-2 gap-4">
+            <div className="space-y-1">
+              <label className="text-xs font-medium text-muted">Target workspace URL</label>
+              <input
+                type="url"
+                value={targetUrl}
+                onChange={(e) => setTargetUrl(e.target.value)}
+                placeholder="https://my-prod-workspace.cloud.databricks.com"
+                className="w-full px-3 py-1.5 text-sm border border-default rounded-lg bg-elevated text-primary placeholder:text-muted focus:outline-none focus:ring-1 focus:ring-accent"
+              />
+            </div>
+            <div className="space-y-1">
+              <label className="text-xs font-medium text-muted">
+                Target space ID <span className="font-normal">(optional — updates existing space)</span>
+              </label>
+              <input
+                type="text"
+                value={targetSpaceId}
+                onChange={(e) => setTargetSpaceId(e.target.value)}
+                placeholder="01f1347d7f1516ceaea7e5853166498f"
+                className="w-full px-3 py-1.5 text-sm border border-default rounded-lg bg-elevated text-primary placeholder:text-muted focus:outline-none focus:ring-1 focus:ring-accent"
+              />
+            </div>
+          </div>
+
+          <div className="space-y-2">
+            <div className="flex items-center justify-between">
+              <label className="text-xs font-medium text-muted">
+                Catalog mapping <span className="font-normal">(source → target)</span>
+              </label>
+              <button
+                type="button"
+                onClick={() => setCatalogMappings([...catalogMappings, { source: "", target: "" }])}
+                className="flex items-center gap-1 text-xs text-accent hover:text-accent/80 transition-colors"
+              >
+                <Plus className="w-3 h-3" /> Add mapping
+              </button>
+            </div>
+            {catalogMappings.map((m, i) => (
+              <div key={i} className="flex items-center gap-2">
+                <input
+                  type="text"
+                  value={m.source}
+                  onChange={(e) => {
+                    const next = [...catalogMappings]
+                    next[i] = { ...next[i], source: e.target.value }
+                    setCatalogMappings(next)
+                  }}
+                  placeholder="dev_catalog"
+                  className="flex-1 px-3 py-1.5 text-sm border border-default rounded-lg bg-elevated text-primary placeholder:text-muted focus:outline-none focus:ring-1 focus:ring-accent"
+                />
+                <span className="text-xs text-muted">→</span>
+                <input
+                  type="text"
+                  value={m.target}
+                  onChange={(e) => {
+                    const next = [...catalogMappings]
+                    next[i] = { ...next[i], target: e.target.value }
+                    setCatalogMappings(next)
+                  }}
+                  placeholder="prod_catalog"
+                  className="flex-1 px-3 py-1.5 text-sm border border-default rounded-lg bg-elevated text-primary placeholder:text-muted focus:outline-none focus:ring-1 focus:ring-accent"
+                />
+                <button
+                  type="button"
+                  onClick={() => setCatalogMappings(catalogMappings.filter((_, j) => j !== i))}
+                  className="text-muted hover:text-danger transition-colors"
+                >
+                  <Trash2 className="w-3.5 h-3.5" />
+                </button>
+              </div>
+            ))}
+            {catalogMappings.length === 0 && (
+              <p className="text-xs text-muted italic">No catalog mappings — table references will be used as-is</p>
+            )}
+          </div>
+        </CardContent>
+      </Card>
+
+      {/* Error */}
+      {deployError && (
+        <div className="rounded-lg bg-danger/10 border border-danger/20 px-4 py-3 text-sm text-danger">
+          {deployError}
+        </div>
+      )}
+
+      {/* Success */}
+      {deploySuccess && (
+        <div className="flex items-start gap-3 rounded-lg border border-emerald-500/30 bg-emerald-500/5 px-4 py-3">
+          <CheckCircle2 className="mt-0.5 h-5 w-5 text-emerald-600 shrink-0" />
+          <div className="flex-1">
+            <h3 className="text-sm font-semibold text-emerald-900 dark:text-emerald-300">
+              Deployed successfully
+            </h3>
+            <p className="mt-0.5 text-xs text-muted">
+              Space config deployed to {deploySuccess.targetUrl} (space: {deploySuccess.targetSpaceId})
+            </p>
+          </div>
+          <a
+            href={deploySuccess.spaceUrl || deploySuccess.targetUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="shrink-0 inline-flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium rounded-md border border-emerald-500/30 text-emerald-700 dark:text-emerald-300 hover:bg-emerald-500/10 transition-colors"
+          >
+            {deploySuccess.spaceUrl ? "Open Genie Space" : "Open Workspace"}
+            <ExternalLink className="h-3.5 w-3.5" />
+          </a>
+        </div>
+      )}
+
+      {/* Deploy button */}
+      <button
+        onClick={handleDeploy}
+        disabled={deploying || !targetUrl.trim()}
+        className="flex items-center gap-2 px-5 py-2.5 rounded-lg bg-accent text-white font-semibold hover:bg-accent/90 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
+      >
+        <Rocket className="w-4 h-4" />
+        {deploying ? "Deploying..." : "Deploy to Target Workspace"}
+      </button>
+    </div>
+  )
+}
diff --git a/frontend/src/pages/SpaceDetail.tsx b/frontend/src/pages/SpaceDetail.tsx
index efab5f35d..db9dec6f0 100644
--- a/frontend/src/pages/SpaceDetail.tsx
+++ b/frontend/src/pages/SpaceDetail.tsx
@@ -4,7 +4,7 @@
  * Score tab includes an inline FixAgentPanel that slides in from the right.
  */
 import { useState, useEffect, useRef } from "react"
-import { ArrowLeft, Star, BarChart2, Clock, ExternalLink, Rocket, Play, Zap, ChevronDown, ChevronRight, Settings, RefreshCw } from "lucide-react"
+import { ArrowLeft, Star, BarChart2, Clock, ExternalLink, Rocket, Play, Upload, Zap, ChevronDown, ChevronRight, Settings, RefreshCw } from "lucide-react"
 import { scanSpace, toggleStar, getSpaceHistory, getSpaceDetail, getActiveRunForSpace } from "@/lib/api"
 import { MATURITY_COLORS, getOptimizationLabel } from "@/lib/utils"
 import type { ScanResult, ScoreHistoryPoint, OptimizationEvent } from "@/types"
@@ -13,10 +13,11 @@ import { HistoryTab } from "./HistoryTab"
 import { useAnalysis } from "@/hooks/useAnalysis"
 import { SpaceOverview } from "@/components/SpaceOverview"
 import { AutoOptimizeTab } from "@/components/auto-optimize/AutoOptimizeTab"
+import { DeployTab } from "./DeployTab"
 import { FixAgentPanel } from "@/components/FixAgentPanel"
 
-type Tab = "score" | "optimize" | "history"
-const VALID_TABS: readonly string[] = ["score", "optimize", "history"]
+type Tab = "score" | "optimize" | "history" | "deploy"
+const VALID_TABS: readonly string[] = ["score", "optimize", "history", "deploy"]
 
 interface SpaceDetailProps {
   spaceId: string
@@ -162,6 +163,7 @@ export function SpaceDetail({ spaceId, displayName, spaceUrl, initialTab, autoSc
     { id: "score", label: "Score", icon: <BarChart2 className="w-4 h-4" /> },
     { id: "optimize", label: "Optimize", icon: <Rocket className="w-4 h-4" /> },
     { id: "history", label: "History", icon: <Clock className="w-4 h-4" /> },
+    { id: "deploy", label: "Deploy", icon: <Upload className="w-4 h-4" /> },
   ]
 
   // Determine contextual action(s) based on scan results
@@ -322,6 +324,9 @@ export function SpaceDetail({ spaceId, displayName, spaceUrl, initialTab, autoSc
         {activeTab === "history" && (
           <HistoryTab history={history} optimizationEvents={optimizationEvents} isLoading={isLoadingHistory} />
         )}
+        {activeTab === "deploy" && (
+          <DeployTab spaceId={spaceId} />
+        )}
       </div>
 
       {/* Fix agent modal overlay */}
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 0b5f6681f..8814c633a 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -264,6 +264,8 @@ export interface GSOTriggerRequest {
   apply_mode?: "genie_config" | "uc_artifact" | "both"
   levers?: number[]
   deploy_target?: string
+  deploy_space_id?: string
+  catalog_map?: Record<string, string>
 }
 
 export interface GSOTriggerResponse {
@@ -397,6 +399,7 @@ export interface GSOPipelineRun {
   levers: GSOLeverStatus[]
   links: GSOResourceLink[]
   convergenceReason: string | null
+  deployTarget: string | null
   deploymentStatus: string | null
   labelingSessionUrl: string | null
   labelingSessionName: string | null
diff --git a/packages/genie-space-optimizer/src/genie_space_optimizer/backend/job_launcher.py b/packages/genie-space-optimizer/src/genie_space_optimizer/backend/job_launcher.py
index de08d8954..795378dfb 100644
--- a/packages/genie-space-optimizer/src/genie_space_optimizer/backend/job_launcher.py
+++ b/packages/genie-space-optimizer/src/genie_space_optimizer/backend/job_launcher.py
@@ -363,6 +363,8 @@ def submit_optimization(
     triggered_by: str = "",
     experiment_name: str = "",
     deploy_target: str = "",
+    deploy_space_id: str = "",
+    catalog_map: str = "",
     warehouse_id: str = "",
     target_benchmark_count: str = "",
 ) -> tuple[str, int]:
@@ -393,6 +395,8 @@ def submit_optimization(
                 "triggered_by": triggered_by,
                 "experiment_name": experiment_name,
                 "deploy_target": deploy_target,
+                "deploy_space_id": deploy_space_id,
+                "catalog_map": catalog_map,
                 "warehouse_id": warehouse_id,
                 "target_benchmark_count": target_benchmark_count,
             },
diff --git a/packages/genie-space-optimizer/src/genie_space_optimizer/integration/trigger.py b/packages/genie-space-optimizer/src/genie_space_optimizer/integration/trigger.py
index bf881e067..0ec718cb3 100644
--- a/packages/genie-space-optimizer/src/genie_space_optimizer/integration/trigger.py
+++ b/packages/genie-space-optimizer/src/genie_space_optimizer/integration/trigger.py
@@ -45,6 +45,8 @@ def trigger_optimization(
     apply_mode: str = "genie_config",
     levers: list[int] | None = None,
     deploy_target: str | None = None,
+    deploy_space_id: str | None = None,
+    catalog_map: dict[str, str] | None = None,
 ) -> TriggerResult:
     """Trigger a GSO optimization run using SQL Warehouse for state management.
 
@@ -227,6 +229,8 @@ def trigger_optimization(
             triggered_by=caller_email,
             experiment_name=experiment_name or "",
             deploy_target=deploy_target or "",
+            deploy_space_id=deploy_space_id or "",
+            catalog_map=json.dumps(catalog_map) if catalog_map else "",
             warehouse_id=config.warehouse_id or "",
         )
 
diff --git a/packages/genie-space-optimizer/src/genie_space_optimizer/jobs/run_cross_env_deploy.py b/packages/genie-space-optimizer/src/genie_space_optimizer/jobs/run_cross_env_deploy.py
index 09bbc6a66..b1b6c45fe 100644
--- a/packages/genie-space-optimizer/src/genie_space_optimizer/jobs/run_cross_env_deploy.py
+++ b/packages/genie-space-optimizer/src/genie_space_optimizer/jobs/run_cross_env_deploy.py
@@ -56,11 +56,13 @@
 dbutils.widgets.text("model_version", "", "Model Version")
 dbutils.widgets.text("target_workspace_url", "", "Target Workspace URL")
 dbutils.widgets.text("target_space_id", "", "Target Space ID")
+dbutils.widgets.text("catalog_map", "", "Catalog Mapping (JSON)")
 
 model_name = dbutils.widgets.get("model_name").strip()
 model_version = dbutils.widgets.get("model_version").strip()
 target_workspace_url = dbutils.widgets.get("target_workspace_url").strip()
 target_space_id = dbutils.widgets.get("target_space_id").strip()
+catalog_map_raw = dbutils.widgets.get("catalog_map").strip()
 
 _banner("Resolved Parameters")
 _log(
@@ -139,6 +141,29 @@
 
 _log("Config loaded", keys=list(space_config.keys()))
 
+# Remap catalog references if catalog_map is provided
+catalog_map: dict[str, str] = {}
+if catalog_map_raw:
+    try:
+        catalog_map = json.loads(catalog_map_raw)
+    except json.JSONDecodeError:
+        _log("WARNING: Could not parse catalog_map JSON, skipping remapping", raw=catalog_map_raw)
+
+if catalog_map:
+    _banner("Remapping Catalog References")
+    remapped = 0
+    for source_list_key in ("tables", "metric_views"):
+        for src in space_config.get("data_sources", {}).get(source_list_key, []):
+            ident = src.get("identifier", "")
+            parts = ident.replace("`", "").split(".")
+            if len(parts) >= 3 and parts[0] in catalog_map:
+                old_ident = ident
+                parts[0] = catalog_map[parts[0]]
+                src["identifier"] = ".".join(parts)
+                _log("Remapped", old=old_ident, new=src["identifier"])
+                remapped += 1
+    _log("Catalog remapping complete", remapped=remapped, mappings=catalog_map)
+
 # COMMAND ----------
 
 # MAGIC %md
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 7d2cacb58..02facf273 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -592,12 +592,24 @@ if lakebase_db:
         }
     }
 
-print(json.dumps({'user_api_scopes': scopes, 'resources': list(by_name.values())}))
+resources_list = list(by_name.values())
+print(json.dumps({'user_api_scopes': scopes, 'resources': resources_list}) + '|||' + json.dumps({'resources': resources_list}))
 ")
-databricks api patch "/api/2.0/apps/$APP_NAME" \
-    --profile "$PROFILE" --json "$PATCH_PAYLOAD" 2>/dev/null && \
-    echo "  ✓ App scopes and resources configured" || \
-    echo "  ⚠ Could not configure app scopes/resources"
+
+# Split into scopes+resources and resources-only payloads
+PATCH_WITH_SCOPES="${PATCH_PAYLOAD%%|||*}"
+PATCH_RESOURCES_ONLY="${PATCH_PAYLOAD##*|||}"
+
+# Try with scopes first; if workspace doesn't support token passthrough, retry resources-only
+if databricks api patch "/api/2.0/apps/$APP_NAME" \
+    --profile "$PROFILE" --json "$PATCH_WITH_SCOPES" 2>/dev/null; then
+    echo "  ✓ App scopes and resources configured"
+elif databricks api patch "/api/2.0/apps/$APP_NAME" \
+    --profile "$PROFILE" --json "$PATCH_RESOURCES_ONLY" 2>/dev/null; then
+    echo "  ✓ App resources configured (user_api_scopes not supported on this workspace)"
+else
+    echo "  ⚠ Could not configure app resources"
+fi
 
 databricks apps deploy "$APP_NAME" --profile "$PROFILE" \
     --source-code-path "$WS_PATH" --no-wait