diff --git a/app/(app)/apps/[id]/page.tsx b/app/(app)/apps/[id]/page.tsx
index e9ac14c..6c2d313 100644
--- a/app/(app)/apps/[id]/page.tsx
+++ b/app/(app)/apps/[id]/page.tsx
@@ -22,9 +22,7 @@ import KeyBadge from "@/components/dashboard/KeyBadge";
 import CallsTable from "@/components/dashboard/CallsTable";
 import StatusDot from "@/components/dashboard/StatusDot";
 import {
-  getCapabilityById,
-  getPipelineById,
-  pipelineToExploreApp,
+  getAppById,
   effectiveVisibility,
   setPipelineVisibility,
   organizationSlug,
@@ -44,7 +42,7 @@ import {
   OverviewTab,
   SettingsTab,
 } from "@/components/dashboard/AppDetailView";
-import type { App, PipelineVisibility } from "@/lib/dashboard/types";
+import type { App, Pipeline, PipelineVisibility } from "@/lib/dashboard/types";
 
 // ─── Tabs ───
 //
@@ -73,9 +71,10 @@ type TabSpec = {
   count?: number;
 };
 
-// Overview leads when the app is deployment-backed (so there's something to
-// show). It's a read-only summary — KPIs + deployment metadata — viewable by
-// anyone who can see the app, not just the owner.
+// Overview is the app's front page and the default tab for everyone. It's a
+// read-only summary — headline stats + how to call it, plus deployment metadata
+// when the app is deployment-backed — rendered from the catalog model, so it's
+// available for any app, not just the org's own deployments.
 const OVERVIEW_TAB: TabSpec = { key: "overview", label: "Overview", icon: Box };
 
 const TABS: TabSpec[] = [
@@ -594,59 +593,57 @@ export default function AppDetailPage() {
   const { id } = useParams<{ id: string }>();
   const { isConnected } = useAuth();
 
-  // The owned deployment (exists for your apps, public or private) and the
-  // public catalog entry (exists for any listed app). The catalog object is the
-  // render base; for a private app with no catalog listing we derive it from the
-  // pipeline so the same template still works.
-  const pipeline = getPipelineById(id);
+  // The unified app — its catalog face and (always, since unification) its
+  // deployment manifest under `app.deployment`. One id-based lookup resolves
+  // both the org's own apps and the third-party catalog models.
+  const app = getAppById(id);
   // Owner/operator chrome (Settings/manage tab, publish controls) lives in the
   // stacked apps PR. In the consumer base the app detail is view-only for
   // everyone, so owner mode is gated off here; the stacked PR's revert removes
   // this flag to re-enable ownership.
   const OWNER_MODE_ENABLED = false;
   const isOwner = OWNER_MODE_ENABLED && isConnected && PIPELINE_APP_IDS.has(id);
-  const model =
-    getCapabilityById(id) ??
-    (pipeline ? pipelineToExploreApp(pipeline) : undefined);
 
   // Visibility (publish state) for the owner Settings tab.
   const [visibility, setVisibility] = useState<PipelineVisibility>(
-    pipeline?.visibility ?? "private",
+    app?.deployment?.visibility ?? "private",
   );
   useEffect(() => {
-    if (pipeline) setVisibility(effectiveVisibility(pipeline));
+    if (app) setVisibility(effectiveVisibility(app));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [id]);
   const toggleVisibility = () => {
-    if (!pipeline) return;
+    if (!app) return;
     const next: PipelineVisibility =
       visibility === "public" ? "private" : "public";
-    setPipelineVisibility(pipeline.id, next);
+    setPipelineVisibility(app.id, next);
     setVisibility(next);
   };
 
   // Runs filtered to this app — drives both the Runs panel and the count chip.
-  // `model` may be undefined (404 path below); run the hook unconditionally.
+  // `app` may be undefined (404 path below); run the hook unconditionally.
   const filteredRuns = useMemo(() => {
-    if (!model) return [];
+    if (!app) return [];
     return MOCK_RECENT_REQUESTS.filter((r) =>
-      modelMatchesRow(model.id, r.model),
+      modelMatchesRow(app.id, r.model),
     );
-  }, [model]);
+  }, [app]);
 
-  // Tab set: Overview (when deployment-backed) + the consumer tabs are shown to
-  // everyone; owners additionally get the Settings trail.
+  // Tab set: Overview + the consumer tabs are shown to everyone (Overview
+  // renders from the catalog model, so it's there for any app); owners
+  // additionally get the Settings trail.
   const tabs: TabSpec[] = useMemo(() => {
     const consumer = TABS.map((t) =>
       t.key === "jobs" ? { ...t, count: filteredRuns.length } : t,
     );
-    const base = pipeline ? [OVERVIEW_TAB, ...consumer] : consumer;
+    const base = [OVERVIEW_TAB, ...consumer];
     return isOwner ? [...base, ...OWNER_TABS] : base;
-  }, [filteredRuns.length, isOwner, pipeline]);
+  }, [filteredRuns.length, isOwner]);
 
-  // Default landing tab: owners land on Overview (the console chrome); everyone
-  // else on Playground. A `?tab=` param overrides when the viewer has that tab.
-  const defaultTab: Tab = isOwner ? "overview" : "playground";
+  // Default landing tab: Overview — the app's front page (what it is, how it
+  // performs, how to call it). A `?tab=` param overrides when the viewer has
+  // that tab.
+  const defaultTab: Tab = "overview";
   const [activeTab, setActiveTab] = useState<Tab>(defaultTab);
   useEffect(() => {
     const requested = new URLSearchParams(window.location.search).get(
@@ -660,7 +657,7 @@ export default function AppDetailPage() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [id, isOwner]);
 
-  if (!model) {
+  if (!app) {
     return (
       <main id="main-content" className="flex flex-1 flex-col bg-dark">
         <div className="flex flex-1 flex-col items-center justify-center text-center">
@@ -676,40 +673,41 @@ export default function AppDetailPage() {
     );
   }
 
-  const Icon = getAppIcon(model.category);
+  const deployment = app.deployment;
+  const Icon = getAppIcon(app.category);
 
   // One status indicator: deploy state for owners, runtime liveness for
   // consumers. One type indicator: Live (streaming) vs Batch (request/response).
   const statusTone =
-    isOwner && pipeline
-      ? pipeline.status === "deployed"
+    isOwner && deployment
+      ? deployment.status === "deployed"
         ? "green"
-        : pipeline.status === "error"
+        : deployment.status === "error"
           ? "red"
-          : pipeline.status === "building"
+          : deployment.status === "building"
             ? "amber"
             : "blue"
-      : model.status === "hot"
+      : app.status === "hot"
         ? "warm"
         : "blue";
   const statusLabel =
-    isOwner && pipeline
-      ? pipeline.status === "deployed"
+    isOwner && deployment
+      ? deployment.status === "deployed"
         ? "Deployed"
-        : pipeline.status === "building"
+        : deployment.status === "building"
           ? "Building"
-          : pipeline.status === "error"
+          : deployment.status === "error"
             ? "Error"
             : "Stopped"
-      : model.status === "hot"
+      : app.status === "hot"
         ? "warm"
         : "cold";
   const statusStatic =
-    isOwner && pipeline
-      ? pipeline.status !== "deployed"
-      : model.status !== "hot";
+    isOwner && deployment
+      ? deployment.status !== "deployed"
+      : app.status !== "hot";
   const isLive =
-    isOwner && pipeline ? pipeline.kind === "live" : Boolean(model.realtime);
+    isOwner && deployment ? deployment.kind === "live" : Boolean(app.realtime);
 
   return (
     <main id="main-content" className="flex flex-1 flex-col bg-dark">
@@ -722,15 +720,15 @@ export default function AppDetailPage() {
           aria-label="Breadcrumb"
         >
           <Link
-            href={`/orgs/${organizationSlug(model.provider)}`}
+            href={`/orgs/${organizationSlug(app.provider)}`}
             className="text-fg-muted transition-colors hover:text-fg"
           >
-            {model.provider}
+            {app.provider}
           </Link>
           <span className="text-fg-disabled" aria-hidden="true">
             /
           </span>
-          <span className="truncate font-medium text-fg">{model.name}</span>
+          <span className="truncate font-medium text-fg">{app.name}</span>
         </nav>
       </div>
 
@@ -742,9 +740,9 @@ export default function AppDetailPage() {
           <div className="flex items-start gap-4">
             {/* Thumbnail — cover image, or a bordered icon tile fallback. */}
             <div className="relative h-14 w-14 shrink-0 overflow-hidden rounded-md border border-subtle bg-dark-card">
-              {model.coverImage ? (
+              {app.coverImage ? (
                 <img
-                  src={model.coverImage}
+                  src={app.coverImage}
                   alt=""
                   className="h-full w-full object-cover"
                 />
@@ -766,7 +764,7 @@ export default function AppDetailPage() {
             <div className="min-w-0 flex-1">
               <div className="flex flex-wrap items-center gap-x-3 gap-y-2">
                 <h1 className="text-[22px] font-semibold tracking-[-0.02em] text-fg">
-                  {model.name}
+                  {app.name}
                 </h1>
                 <span className="inline-flex items-center gap-1.5 text-[12.5px] text-fg-strong">
                   <StatusDot tone={statusTone} static={statusStatic} />
@@ -808,7 +806,7 @@ export default function AppDetailPage() {
                 </button>
               </div>
               <p className="mt-2 max-w-[680px] text-[13.5px] leading-[1.5] text-fg-muted">
-                {model.description}
+                {app.description}
               </p>
             </div>
           </div>
@@ -897,23 +895,23 @@ export default function AppDetailPage() {
             aria-labelledby={`tab-${activeTab}`}
           >
             {/* Overview (read-only summary, shown to anyone) + Settings (owner
-                only) reuse the deployment-console chrome verbatim. */}
-            {activeTab === "overview" && pipeline && (
-              <OverviewTab app={pipeline} />
-            )}
-            {activeTab === "settings" && pipeline && (
+                only) reuse the deployment-console chrome verbatim. Overview
+                renders from the catalog model, so it works for any app; the
+                deployment manifest, when present, enriches it. */}
+            {activeTab === "overview" && <OverviewTab app={app} />}
+            {activeTab === "settings" && app.deployment && (
               <SettingsTab
-                app={pipeline}
+                app={app as Pipeline}
                 visibility={visibility}
                 onToggleVisibility={toggleVisibility}
               />
             )}
-            {activeTab === "playground" && <PlaygroundTab model={model} />}
-            {activeTab === "api" && <ApiTab model={model} />}
-            {activeTab === "readme" && <ReadmeTab model={model} />}
-            {activeTab === "stats" && <StatsTab model={model} />}
+            {activeTab === "playground" && <PlaygroundTab model={app} />}
+            {activeTab === "api" && <ApiTab model={app} />}
+            {activeTab === "readme" && <ReadmeTab model={app} />}
+            {activeTab === "stats" && <StatsTab model={app} />}
             {activeTab === "jobs" && (
-              <JobsTab model={model} runs={filteredRuns} />
+              <JobsTab model={app} runs={filteredRuns} />
             )}
           </div>
         </div>
diff --git a/components/dashboard/AppDetailView.tsx b/components/dashboard/AppDetailView.tsx
index 4ba797e..f990787 100644
--- a/components/dashboard/AppDetailView.tsx
+++ b/components/dashboard/AppDetailView.tsx
@@ -23,13 +23,15 @@ import KpiStrip from "@/components/dashboard/KpiStrip";
 import KpiCard from "@/components/dashboard/KpiCard";
 import CopyButton from "@/components/dashboard/CopyButton";
 import {
-  getPipelineById,
+  getAppById,
   effectiveVisibility,
   setPipelineVisibility,
   deploymentsForPipeline,
   getEnvironmentById,
 } from "@/lib/dashboard/mock-data";
+import { formatPrice } from "@/lib/dashboard/utils";
 import type {
+  App,
   Pipeline,
   PipelineStatusKind,
   PipelineVisibility,
@@ -116,17 +118,33 @@ function Card({
 
 // ── Overview ──────────────────────────────────────────────────────────────────
 
-export function OverviewTab({ app }: { app: Pipeline }) {
-  const baseUrl =
-    app.kind === "live"
-      ? `wss://api.livepeer.org/live/${app.pipelineId}`
-      : `https://api.livepeer.org/run/${app.pipelineId}`;
-
+/**
+ * OverviewTab — the app's front page, shown to anyone (consumer or owner).
+ *
+ * It renders from the catalog fields on `app` (which exist for every app, so it
+ * works for the public apps a consumer browses from Explore) and enriches with
+ * the deployment manifest (`app.deployment`) when present — the Deployment +
+ * Schema cards and the per-route endpoint list. Since unification every app
+ * carries a deployment, but the `app.deployment` guards remain for safety.
+ */
+export function OverviewTab({ app }: { app: App }) {
+  const deployment = app.deployment;
+  // Call endpoint — the deployed pipelineId when we have it, else the catalog
+  // slug. Live apps stream over a websocket; batch apps are request/response.
+  const slug = deployment?.pipelineId ?? app.id;
+  const isLive = deployment ? deployment.kind === "live" : Boolean(app.realtime);
+  const baseUrl = isLive
+    ? `wss://api.livepeer.org/live/${slug}`
+    : `https://api.livepeer.org/run/${slug}`;
+
+  // The request schema is derived from the deployment manifest, so it's only
+  // available for deployment-backed apps.
   const schema = useMemo(() => {
-    if (app.kind === "live") {
+    if (!deployment) return null;
+    if (deployment.kind === "live") {
       return JSON.stringify(
         {
-          pipeline_id: app.pipelineId,
+          pipeline_id: deployment.pipelineId,
           transport: "trickle",
           channels: ["video", "events", "data"],
           params: { type: "object", additionalProperties: true },
@@ -137,7 +155,7 @@ export function OverviewTab({ app }: { app: Pipeline }) {
     }
     return JSON.stringify(
       {
-        pipeline_id: app.pipelineId,
+        pipeline_id: deployment.pipelineId,
         input: { type: "object", required: ["input"] },
         output: { type: "object" },
         streaming: app.name.includes("SSE"),
@@ -145,94 +163,106 @@ export function OverviewTab({ app }: { app: Pipeline }) {
       null,
       2,
     );
-  }, [app]);
+  }, [deployment, app.name]);
 
   return (
     <div className="flex flex-col gap-5">
+      {/* Headline stats — from the catalog fields, available for every app.
+          Warm-orchestrator count is a liveness/capacity signal for the caller. */}
       <KpiStrip cols={4}>
-        <KpiCard
-          label="Calls · 7d"
-          value={app.calls7d.toLocaleString()}
-        />
+        <KpiCard label="Calls · 7d" value={app.runs7d.toLocaleString()} />
         <KpiCard
           label="p50 latency"
-          value={app.p50LatencyMs > 0 ? String(app.p50LatencyMs) : "—"}
-          unit={app.p50LatencyMs > 0 ? "ms" : undefined}
-        />
-        <KpiCard
-          label="Error rate"
-          value={app.errorRatePct.toFixed(1)}
-          unit="%"
+          value={app.latency > 0 ? String(app.latency) : "—"}
+          unit={app.latency > 0 ? "ms" : undefined}
         />
+        <KpiCard label="Uptime" value={app.uptime.toFixed(1)} unit="%" />
         <KpiCard
           label="Warm orchestrators"
-          value={String(app.warmOrchestrators)}
+          value={String(app.orchestrators)}
         />
       </KpiStrip>
 
-      <Card title="Deployment" icon={Box}>
-        <MetaRow label="Pipeline ID">
-          <span className="font-mono text-[12.5px]">{app.pipelineId}</span>
-        </MetaRow>
-        <MetaRow label="Entrypoint">
-          <span className="font-mono text-[12.5px]">{app.entrypoint}</span>
-        </MetaRow>
-        <MetaRow label="Image">
-          <span className="font-mono text-[12px] text-fg-muted">
-            {app.image}
-          </span>
-        </MetaRow>
-        <MetaRow label="Version">
-          <span className="font-mono text-[12.5px]">{app.version}</span>
-        </MetaRow>
-        <MetaRow label="GPU">
-          {app.gpu ? (
-            <span className="font-mono text-[12.5px]">{app.gpu}</span>
-          ) : (
-            <span className="text-fg-faint">CPU</span>
-          )}
-        </MetaRow>
-        <MetaRow label="Last deployed">{formatDeployed(app.lastDeployedAt)}</MetaRow>
-        <MetaRow label="Deployed by">
-          <span className="inline-flex items-center gap-1.5">
-            <span
-              className="grid h-4 w-4 place-items-center rounded text-[8.5px] font-semibold text-white"
-              style={{ background: app.createdBy.color }}
-              aria-hidden="true"
-            >
-              {app.createdBy.initials}
+      {deployment ? (
+        <Card title="Deployment" icon={Box}>
+          <MetaRow label="Pipeline ID">
+            <span className="font-mono text-[12.5px]">{deployment.pipelineId}</span>
+          </MetaRow>
+          <MetaRow label="Entrypoint">
+            <span className="font-mono text-[12.5px]">{deployment.entrypoint}</span>
+          </MetaRow>
+          <MetaRow label="Image">
+            <span className="font-mono text-[12px] text-fg-muted">
+              {deployment.image}
             </span>
-            {app.createdBy.name}
-          </span>
-        </MetaRow>
-        <MetaRow label="Environments">
-          <span className="flex flex-wrap items-center gap-1.5">
-            {deploymentsForPipeline(app.pipelineId).map((d) => {
-              const env = getEnvironmentById(d.environmentId);
-              const dotColor =
-                env?.kind === "production"
-                  ? "var(--color-green-bright)"
-                  : "var(--color-blue-bright)";
-              return (
-                <span
-                  key={d.id}
-                  className="inline-flex items-center gap-1.5 rounded-full border border-hairline px-2 py-0.5 text-[11.5px] text-fg-strong"
-                >
+          </MetaRow>
+          <MetaRow label="Version">
+            <span className="font-mono text-[12.5px]">{deployment.version}</span>
+          </MetaRow>
+          <MetaRow label="GPU">
+            {deployment.gpu ? (
+              <span className="font-mono text-[12.5px]">{deployment.gpu}</span>
+            ) : (
+              <span className="text-fg-faint">CPU</span>
+            )}
+          </MetaRow>
+          <MetaRow label="Last deployed">
+            {formatDeployed(deployment.lastDeployedAt)}
+          </MetaRow>
+          <MetaRow label="Deployed by">
+            <span className="inline-flex items-center gap-1.5">
+              <span
+                className="grid h-4 w-4 place-items-center rounded text-[8.5px] font-semibold text-white"
+                style={{ background: deployment.createdBy.color }}
+                aria-hidden="true"
+              >
+                {deployment.createdBy.initials}
+              </span>
+              {deployment.createdBy.name}
+            </span>
+          </MetaRow>
+          <MetaRow label="Environments">
+            <span className="flex flex-wrap items-center gap-1.5">
+              {deploymentsForPipeline(deployment.pipelineId).map((d) => {
+                const env = getEnvironmentById(d.deployment!.environmentId);
+                const dotColor =
+                  env?.kind === "production"
+                    ? "var(--color-green-bright)"
+                    : "var(--color-blue-bright)";
+                return (
                   <span
-                    className="h-[5px] w-[5px] rounded-full"
-                    style={{ background: dotColor }}
-                    aria-hidden="true"
-                  />
-                  {env?.name ?? d.environmentId}
-                </span>
-              );
-            })}
-          </span>
-        </MetaRow>
-      </Card>
+                    key={d.id}
+                    className="inline-flex items-center gap-1.5 rounded-full border border-hairline px-2 py-0.5 text-[11.5px] text-fg-strong"
+                  >
+                    <span
+                      className="h-[5px] w-[5px] rounded-full"
+                      style={{ background: dotColor }}
+                      aria-hidden="true"
+                    />
+                    {env?.name ?? d.deployment!.environmentId}
+                  </span>
+                );
+              })}
+            </span>
+          </MetaRow>
+        </Card>
+      ) : (
+        <Card title="Details" icon={ScrollText}>
+          <MetaRow label="Provider">{app.provider}</MetaRow>
+          <MetaRow label="Category">
+            <span className="font-mono text-[12.5px]">{app.category}</span>
+          </MetaRow>
+          <MetaRow label="Type">
+            {isLive ? "Live · streaming" : "Batch · request/response"}
+          </MetaRow>
+          <MetaRow label="Pricing">
+            <span className="font-mono text-[12.5px]">{formatPrice(app)}</span>
+          </MetaRow>
+        </Card>
+      )}
 
       <Card title="Endpoint" icon={Globe}>
-        <div className="border-b border-hairline px-4 py-3">
+        <div className="border-b border-hairline px-4 py-3 last:border-b-0">
           <div className="flex items-center gap-2 rounded-[6px] border border-subtle bg-dark px-3 py-2">
             <span className="min-w-0 flex-1 overflow-x-auto whitespace-nowrap font-mono text-[12.5px] text-fg">
               {baseUrl}
@@ -240,35 +270,39 @@ export function OverviewTab({ app }: { app: Pipeline }) {
             <CopyButton value={baseUrl} iconOnly />
           </div>
         </div>
-        <div className="px-1 py-1">
-          {app.endpoints.map((e) => (
-            <div
-              key={`${e.method} ${e.path}`}
-              className="flex items-center gap-3 rounded-[4px] px-3 py-2"
-            >
-              <span className="w-12 shrink-0 font-mono text-[10.5px] font-medium uppercase tracking-[0.04em] text-green-bright">
-                {e.method}
-              </span>
-              <span className="font-mono text-[12.5px] text-fg-strong">
-                {e.path}
-              </span>
-              {e.description && (
-                <span className="ml-auto truncate text-[11.5px] text-fg-faint">
-                  {e.description}
+        {deployment && (
+          <div className="px-1 py-1">
+            {deployment.endpoints.map((e) => (
+              <div
+                key={`${e.method} ${e.path}`}
+                className="flex items-center gap-3 rounded-[4px] px-3 py-2"
+              >
+                <span className="w-12 shrink-0 font-mono text-[10.5px] font-medium uppercase tracking-[0.04em] text-green-bright">
+                  {e.method}
                 </span>
-              )}
-            </div>
-          ))}
-        </div>
+                <span className="font-mono text-[12.5px] text-fg-strong">
+                  {e.path}
+                </span>
+                {e.description && (
+                  <span className="ml-auto truncate text-[11.5px] text-fg-faint">
+                    {e.description}
+                  </span>
+                )}
+              </div>
+            ))}
+          </div>
+        )}
       </Card>
 
-      <Card title="Schema" icon={FileJson}>
-        <div className="px-4 py-3">
-          <pre className="overflow-x-auto rounded-[6px] border border-subtle bg-dark px-3 py-2.5 font-mono text-[12px] leading-[1.6] text-fg-muted">
-            {schema}
-          </pre>
-        </div>
-      </Card>
+      {schema && (
+        <Card title="Schema" icon={FileJson}>
+          <div className="px-4 py-3">
+            <pre className="overflow-x-auto rounded-[6px] border border-subtle bg-dark px-3 py-2.5 font-mono text-[12px] leading-[1.6] text-fg-muted">
+              {schema}
+            </pre>
+          </div>
+        </Card>
+      )}
     </div>
   );
 }
@@ -278,16 +312,17 @@ export function OverviewTab({ app }: { app: Pipeline }) {
 type LogLine = { t: string; level: "info" | "warn" | "error"; msg: string };
 
 function buildLogs(app: Pipeline): LogLine[] {
-  if (app.status === "building") {
+  const deployment = app.deployment;
+  if (deployment.status === "building") {
     return [
-      { t: "08:55:02", level: "info", msg: `Building image for ${app.pipelineId}…` },
+      { t: "08:55:02", level: "info", msg: `Building image for ${deployment.pipelineId}…` },
       { t: "08:55:04", level: "info", msg: "Resolving python packages" },
       { t: "08:55:39", level: "info", msg: "Running prepare step (caching weights)" },
       { t: "08:56:10", level: "info", msg: "Pushing layers to registry" },
       { t: "08:56:22", level: "warn", msg: "Image is large (4.2 GB) — first cold start may be slow" },
     ];
   }
-  if (app.status === "error") {
+  if (deployment.status === "error") {
     return [
       { t: "22:01:00", level: "info", msg: "Session started — events channel open" },
       { t: "22:01:00", level: "info", msg: `setup() complete · model=whisper-tiny.en` },
@@ -296,7 +331,7 @@ function buildLogs(app: Pipeline): LogLine[] {
       { t: "22:01:09", level: "error", msg: "5 records emitted → 3 delivered" },
     ];
   }
-  if (app.kind === "live") {
+  if (deployment.kind === "live") {
     return [
       { t: "17:30:00", level: "info", msg: "Session started — allocating video track" },
       { t: "17:30:00", level: "info", msg: "heartbeat task started" },
@@ -306,7 +341,7 @@ function buildLogs(app: Pipeline): LogLine[] {
     ];
   }
   return [
-    { t: "14:09:00", level: "info", msg: `POST /predict · 200 · ${app.p50LatencyMs}ms` },
+    { t: "14:09:00", level: "info", msg: `POST /predict · 200 · ${deployment.p50LatencyMs}ms` },
     { t: "14:09:01", level: "info", msg: "POST /predict · 200 · 71ms" },
     { t: "14:09:02", level: "info", msg: "POST /predict · 200 · 59ms" },
     { t: "14:09:03", level: "warn", msg: "POST /predict · 200 · 184ms (slow — orchestrator cold)" },
@@ -328,7 +363,7 @@ export function LogsTab({ app }: { app: Pipeline }) {
           <ScrollText className="h-3.5 w-3.5 text-fg-faint" aria-hidden="true" />
           Logs
         </span>
-        {app.status === "deployed" && (
+        {app.deployment.status === "deployed" && (
           <span className="inline-flex items-center gap-1.5 text-[11.5px] text-fg-faint">
             <StatusDot tone="green" />
             live
@@ -439,7 +474,7 @@ export function SettingsTab({
           <p className="text-[12.5px] text-fg-muted">
             Stopping halts the deployment; deleting removes{" "}
             <span className="font-mono text-[11.5px] text-fg-strong">
-              {app.pipelineId}
+              {app.deployment.pipelineId}
             </span>{" "}
             from this environment.
           </p>
@@ -483,8 +518,8 @@ export function AppDetailHeader({
   coverImage?: string;
   Icon?: React.ElementType;
 }) {
-  const status = STATUS_META[app.status];
-  const deployments = deploymentsForPipeline(app.pipelineId);
+  const status = STATUS_META[app.deployment.status];
+  const deployments = deploymentsForPipeline(app.deployment.pipelineId);
   return (
     <>
       {/* Breadcrumb */}
@@ -527,23 +562,23 @@ export function AppDetailHeader({
           {app.name}
         </h1>
         <span className="inline-flex items-center gap-1.5 text-[12.5px] text-fg-strong">
-          <StatusDot tone={status.tone} static={app.status !== "deployed"} />
+          <StatusDot tone={status.tone} static={app.deployment.status !== "deployed"} />
           {status.label}
         </span>
         <span
           className="inline-flex items-center gap-1.5 rounded-[4px] border border-hairline bg-dark-card px-1.5 py-0.5 text-[11px] text-fg-strong"
           title={
-            app.kind === "live"
+            app.deployment.kind === "live"
               ? "LivePipeline · trickle transport"
               : "Pipeline · request/response"
           }
         >
-          {app.kind === "live" ? (
+          {app.deployment.kind === "live" ? (
             <Radio className="h-3 w-3 text-blue-bright" aria-hidden="true" />
           ) : (
             <Box className="h-3 w-3 text-fg-faint" aria-hidden="true" />
           )}
-          {app.kind === "live" ? "Live" : "Batch"}
+          {app.deployment.kind === "live" ? "Live" : "Batch"}
         </span>
         {visibility === "public" && (
           <Link
@@ -577,7 +612,7 @@ export function AppDetailHeader({
             Deployed in
           </span>
           {deployments.map((d) => {
-            const env = getEnvironmentById(d.environmentId);
+            const env = getEnvironmentById(d.deployment!.environmentId);
             const active = d.id === app.id;
             const dotColor =
               env?.kind === "production"
@@ -599,7 +634,7 @@ export function AppDetailHeader({
                   style={{ background: dotColor }}
                   aria-hidden="true"
                 />
-                {env?.name ?? d.environmentId}
+                {env?.name ?? d.deployment!.environmentId}
               </Link>
             );
           })}
@@ -614,10 +649,15 @@ export function AppDetailHeader({
 // ── Main ──────────────────────────────────────────────────────────────────────
 
 export default function AppDetailView({ appId }: { appId: string }) {
-  const app = getPipelineById(appId);
+  // This operator console is only meaningful for a deployment-backed app, so we
+  // narrow to apps that carry a manifest (`Pipeline = App & { deployment }`).
+  const resolved = getAppById(appId);
+  const app: Pipeline | undefined = resolved?.deployment
+    ? (resolved as Pipeline)
+    : undefined;
   const [tab, setTab] = useState<TabKey>("overview");
   const [visibility, setVisibility] = useState<PipelineVisibility>(
-    app?.visibility ?? "private",
+    app?.deployment.visibility ?? "private",
   );
 
   // Hydrate visibility from the persisted override after mount (avoids SSR
@@ -631,10 +671,10 @@ export default function AppDetailView({ appId }: { appId: string }) {
 
   if (!app) return <AppNotFound />;
 
-  const status = STATUS_META[app.status];
+  const status = STATUS_META[app.deployment.status];
 
   // Environments this pipeline is deployed to, for the "Deployed in" pills.
-  const deployments = deploymentsForPipeline(app.pipelineId);
+  const deployments = deploymentsForPipeline(app.deployment.pipelineId);
 
   const toggleVisibility = () => {
     const next: PipelineVisibility =
@@ -667,23 +707,23 @@ export default function AppDetailView({ appId }: { appId: string }) {
             {app.name}
           </h1>
           <span className="inline-flex items-center gap-1.5 text-[12.5px] text-fg-strong">
-            <StatusDot tone={status.tone} static={app.status !== "deployed"} />
+            <StatusDot tone={status.tone} static={app.deployment.status !== "deployed"} />
             {status.label}
           </span>
           <span
             className="inline-flex items-center gap-1.5 rounded-[4px] border border-hairline bg-dark-card px-1.5 py-0.5 text-[11px] text-fg-strong"
             title={
-              app.kind === "live"
+              app.deployment.kind === "live"
                 ? "LivePipeline · trickle transport"
                 : "Pipeline · request/response"
             }
           >
-            {app.kind === "live" ? (
+            {app.deployment.kind === "live" ? (
               <Radio className="h-3 w-3 text-blue-bright" aria-hidden="true" />
             ) : (
               <Box className="h-3 w-3 text-fg-faint" aria-hidden="true" />
             )}
-            {app.kind === "live" ? "Live" : "Batch"}
+            {app.deployment.kind === "live" ? "Live" : "Batch"}
           </span>
           {visibility === "public" && (
             <Link
@@ -720,7 +760,7 @@ export default function AppDetailView({ appId }: { appId: string }) {
               Deployed in
             </span>
             {deployments.map((d) => {
-              const env = getEnvironmentById(d.environmentId);
+              const env = getEnvironmentById(d.deployment!.environmentId);
               const active = d.id === app.id;
               const dotColor =
                 env?.kind === "production"
@@ -742,7 +782,7 @@ export default function AppDetailView({ appId }: { appId: string }) {
                     style={{ background: dotColor }}
                     aria-hidden="true"
                   />
-                  {env?.name ?? d.environmentId}
+                  {env?.name ?? d.deployment!.environmentId}
                 </Link>
               );
             })}
diff --git a/components/dashboard/ExploreView.tsx b/components/dashboard/ExploreView.tsx
index 019b7d8..05bd41d 100644
--- a/components/dashboard/ExploreView.tsx
+++ b/components/dashboard/ExploreView.tsx
@@ -18,7 +18,6 @@ import {
 import {
   APPS,
   publicPipelines,
-  pipelineToExploreApp,
   SEED_PUBLIC_PIPELINE_APPS,
   PIPELINE_APP_IDS,
 } from "@/lib/dashboard/mock-data";
@@ -423,20 +422,28 @@ function ExplorePageInner() {
   const [priceMin, setPriceMin] = useState(0);
   const [priceMax, setPriceMax] = useState(100);
 
-  // Public pipelines (user-published apps) are listed in Explore alongside
-  // first-party network models. Seeded SSR-safely, then refreshed from the
-  // localStorage-backed publish state after mount so toggling a pipeline's
+  // The org's public deployed apps are listed in Explore alongside the
+  // third-party catalog models. Seeded SSR-safely, then refreshed from the
+  // localStorage-backed publish state after mount so toggling an app's
   // visibility on its Settings tab is reflected here on next navigation.
   const [pipelineModels, setPipelineModels] = useState<App[]>(
     SEED_PUBLIC_PIPELINE_APPS,
   );
   useEffect(() => {
-    setPipelineModels(publicPipelines().map(pipelineToExploreApp));
+    setPipelineModels(publicPipelines());
   }, []);
 
+  // APPS now carries the org's own apps too (public + private). Take the
+  // third-party catalog from APPS and re-attach only the *public* owned apps so
+  // private deployments never leak into Explore and nothing is duplicated.
+  const catalogModels = useMemo(
+    () => APPS.filter((m) => !PIPELINE_APP_IDS.has(m.id)),
+    [],
+  );
+
   const allModels = useMemo(
-    () => [...APPS, ...pipelineModels],
-    [pipelineModels],
+    () => [...catalogModels, ...pipelineModels],
+    [catalogModels, pipelineModels],
   );
 
   const dataMaxPrice = useMemo(
diff --git a/lib/dashboard/mock-data.ts b/lib/dashboard/mock-data.ts
index 61e53da..4f1f259 100644
--- a/lib/dashboard/mock-data.ts
+++ b/lib/dashboard/mock-data.ts
@@ -1,7 +1,13 @@
 import type {
   Environment,
-  Pipeline,
+  AppCategory,
+  AppDeployment,
+  PipelineKind,
+  PipelineStatusKind,
+  PipelineEndpoint,
   PipelineVisibility,
+  PricingUnit,
+  PlaygroundConfig,
   App,
   ApiKey,
   EcosystemApp,
@@ -76,7 +82,35 @@ const LIVE_ENDPOINTS = [
 const ZAIN = { name: "Zain", initials: "ZM", color: "var(--color-green)" };
 const MAYA = { name: "Maya", initials: "MK", color: "#7c3aed" };
 
-export const PIPELINES: Pipeline[] = [
+// The org's own deployed apps, authored in the flat (pre-unification) Pipeline
+// shape so the literal below still reads naturally. `legacyToApp` lifts the
+// catalog-facing fields to the top level and nests the manifest under
+// `deployment` to produce the unified `App`.
+interface LegacyDeployment {
+  id: string;
+  name: string;
+  pipelineId: string;
+  environmentId: string;
+  kind: PipelineKind;
+  status: PipelineStatusKind;
+  visibility: PipelineVisibility;
+  description: string;
+  entrypoint: string;
+  gpu: string | null;
+  image: string;
+  version: string;
+  lastDeployedAt: string;
+  createdBy: { name: string; initials: string; color: string };
+  warmOrchestrators: number;
+  calls7d: number;
+  p50LatencyMs: number;
+  errorRatePct: number;
+  endpoints: PipelineEndpoint[];
+  category: AppCategory;
+  price: { amount: number; unit: PricingUnit };
+}
+
+const LEGACY_DEPLOYMENTS: LegacyDeployment[] = [
   // ── Production ──────────────────────────────────────────────────────────────
   {
     id: "app-sentiment",
@@ -303,78 +337,16 @@ export const PIPELINES: Pipeline[] = [
   },
 ];
 
-export function pipelinesForEnvironment(environmentId: string): Pipeline[] {
-  return PIPELINES.filter((p) => p.environmentId === environmentId);
-}
-
-export function getPipelineById(id: string): Pipeline | undefined {
-  return PIPELINES.find((p) => p.id === id);
-}
-
-// ─── Multi-environment deployment helpers ─────────────────────────────────────
-// A pipeline's identity is its `pipelineId`; it can have a deployment in each
-// environment. These resolve the deployment set for a given pipeline so the app
-// detail can show "Deployed in: prod, dev" and follow the env switcher to the
-// right deployment.
-
-export function deploymentsForPipeline(pipelineId: string): Pipeline[] {
-  return PIPELINES.filter((p) => p.pipelineId === pipelineId);
-}
-
-export function environmentsForPipeline(pipelineId: string): string[] {
-  return deploymentsForPipeline(pipelineId).map((p) => p.environmentId);
-}
-
-export function deploymentInEnvironment(
-  pipelineId: string,
-  environmentId: string,
-): Pipeline | undefined {
-  return PIPELINES.find(
-    (p) => p.pipelineId === pipelineId && p.environmentId === environmentId,
-  );
-}
-
-// Publish state. A pipeline's visibility is whether it is listed in Explore.
-// Seed visibility lives on each Pipeline; runtime toggles are persisted as
-// per-id overrides in localStorage so the Apps Settings tab and the Explore
-// grid agree across navigation. Client-only — guarded for SSR.
-const PIPELINE_VISIBILITY_KEY = "livepeer.pipelineVisibility";
-
-function readVisibilityOverrides(): Record<string, PipelineVisibility> {
-  if (typeof window === "undefined") return {};
-  try {
-    return JSON.parse(
-      localStorage.getItem(PIPELINE_VISIBILITY_KEY) || "{}",
-    ) as Record<string, PipelineVisibility>;
-  } catch {
-    return {};
-  }
-}
-
-export function effectiveVisibility(p: Pipeline): PipelineVisibility {
-  return readVisibilityOverrides()[p.id] ?? p.visibility;
-}
-
-export function setPipelineVisibility(
-  id: string,
-  visibility: PipelineVisibility,
-): void {
-  if (typeof window === "undefined") return;
-  const overrides = readVisibilityOverrides();
-  overrides[id] = visibility;
-  localStorage.setItem(PIPELINE_VISIBILITY_KEY, JSON.stringify(overrides));
-}
-
-export function publicPipelines(): Pipeline[] {
-  return PIPELINES.filter((p) => effectiveVisibility(p) === "public");
-}
+// The provider label for the org's own deployed apps.
+const OWNED_APP_PROVIDER = "Flipbook";
 
-// A minimal playground config derived from the pipeline's kind/category, so the
-// consumer face of a published pipeline (its /apps/[id] page) is runnable like
-// any first-party capability.
-function pipelinePlayground(p: Pipeline): import("./types").PlaygroundConfig {
-  const seed = `https://picsum.photos/seed/${p.pipelineId}`;
-  if (p.kind === "live") {
+// A minimal playground config derived from a deployment's kind/category, so the
+// consumer face of a published app (its /apps/[id] page) is runnable like any
+// first-party capability. Matches what the former `pipelineToExploreApp`
+// produced.
+function deploymentPlayground(d: LegacyDeployment): PlaygroundConfig {
+  const seed = `https://picsum.photos/seed/${d.pipelineId}`;
+  if (d.kind === "live") {
     return {
       fields: [],
       outputType: "video",
@@ -382,7 +354,7 @@ function pipelinePlayground(p: Pipeline): import("./types").PlaygroundConfig {
       mockOutputUrl: `${seed}/640/360`,
     };
   }
-  if (p.category === "Image Generation") {
+  if (d.category === "Image Generation") {
     return {
       fields: [
         {
@@ -406,71 +378,148 @@ function pipelinePlayground(p: Pipeline): import("./types").PlaygroundConfig {
         type: "textarea",
         required: true,
         placeholder: "Enter input for the pipeline…",
-        description: `Input passed to ${p.pipelineId}.predict().`,
+        description: `Input passed to ${d.pipelineId}.predict().`,
       },
     ],
     outputType: "json",
     mockOutputJson: {
-      pipeline_id: p.pipelineId,
+      pipeline_id: d.pipelineId,
       output: { label: "positive", score: 0.97 },
-      metrics: { inference_time: p.p50LatencyMs / 1000 },
+      metrics: { inference_time: d.p50LatencyMs / 1000 },
     },
   };
 }
 
 /**
- * Map a Pipeline onto the App shape so its consumer face flows through the
- * existing Explore card / model-detail / playground machinery. The Explore card
- * and detail page both resolve via this; ownership-aware affordances (Manage)
- * are layered on at the view level.
+ * Lift a flat `LegacyDeployment` into the unified `App`: catalog-facing fields
+ * to the top level, the manifest under `deployment`. The derived catalog fields
+ * reproduce exactly what the former `pipelineToExploreApp` produced for Explore
+ * display, plus carry the full deployment manifest.
  */
-export function pipelineToExploreApp(p: Pipeline): App {
-  const warm = p.status === "deployed" && p.warmOrchestrators > 0;
+function legacyToApp(d: LegacyDeployment): App {
+  const warm = d.status === "deployed" && d.warmOrchestrators > 0;
   return {
-    id: p.id,
-    name: p.name,
-    provider: "Flipbook",
-    category: p.category,
-    description: p.description,
+    id: d.id,
+    name: d.name,
+    provider: OWNED_APP_PROVIDER,
+    category: d.category,
+    description: d.description,
     status: warm ? "hot" : "cold",
-    pricing: { amount: p.price.amount, unit: p.price.unit },
-    latency: p.p50LatencyMs,
-    orchestrators: p.warmOrchestrators,
-    runs7d: p.calls7d,
-    uptime: Math.max(0, 100 - p.errorRatePct),
-    realtime: p.kind === "live",
-    playgroundConfig: pipelinePlayground(p),
+    pricing: { amount: d.price.amount, unit: d.price.unit },
+    latency: d.p50LatencyMs,
+    orchestrators: d.warmOrchestrators,
+    runs7d: d.calls7d,
+    uptime: Math.max(0, 100 - d.errorRatePct),
+    realtime: d.kind === "live",
+    playgroundConfig: deploymentPlayground(d),
+    deployment: {
+      pipelineId: d.pipelineId,
+      environmentId: d.environmentId,
+      kind: d.kind,
+      status: d.status,
+      visibility: d.visibility,
+      entrypoint: d.entrypoint,
+      gpu: d.gpu,
+      image: d.image,
+      version: d.version,
+      lastDeployedAt: d.lastDeployedAt,
+      createdBy: d.createdBy,
+      warmOrchestrators: d.warmOrchestrators,
+      calls7d: d.calls7d,
+      p50LatencyMs: d.p50LatencyMs,
+      errorRatePct: d.errorRatePct,
+      endpoints: d.endpoints,
+    },
   };
 }
 
-/**
- * Resolve a capability by id for the consumer detail/playground page — a
- * first-party model OR a pipeline (the consumer face of a deployed app). All
- * pipelines resolve here so an owner can preview a private pipeline's
- * playground; in production this would gate non-owners to public pipelines.
- */
-export function getCapabilityById(id: string): App | undefined {
-  const model = getModelById(id);
-  if (model) return model;
-  const pipeline = getPipelineById(id);
-  return pipeline ? pipelineToExploreApp(pipeline) : undefined;
+// Fixed deploy timestamp for derived catalog deployments — never Date.now().
+const CATALOG_DEPLOYED_AT = "2025-05-01T12:00:00Z";
+
+const CATALOG_BATCH_ENDPOINTS: PipelineEndpoint[] = [
+  { method: "POST", path: "/predict", description: "Request/response inference" },
+  { method: "GET", path: "/health", description: "Health probe" },
+];
+const CATALOG_LIVE_ENDPOINTS: PipelineEndpoint[] = [
+  { method: "WS", path: "/stream" },
+];
+
+function pascalCaseFromId(id: string): string {
+  return id
+    .split(/[^a-z0-9]+/i)
+    .filter(Boolean)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join("");
 }
 
-// SSR-safe seed: public pipelines by their *seed* visibility only (no
-// localStorage). Used as the initial Explore state so server and first client
-// render agree; a useEffect then swaps in the localStorage-aware set.
-export const SEED_PUBLIC_PIPELINE_APPS: App[] = PIPELINES.filter(
-  (p) => p.visibility === "public",
-).map(pipelineToExploreApp);
+function slugFromProvider(provider: string): string {
+  return provider
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "");
+}
 
-/** Ids of pipeline-backed Explore cards — lets Explore route them to /apps/[id]. */
-export const PIPELINE_APP_IDS: ReadonlySet<string> = new Set(
-  PIPELINES.map((p) => p.id),
-);
+function providerInitials(provider: string): string {
+  const parts = provider.trim().split(/\s+/).filter(Boolean);
+  const raw =
+    parts.length === 1
+      ? parts[0].slice(0, 2)
+      : parts[0][0] + parts[parts.length - 1][0];
+  return raw.toUpperCase();
+}
+
+// GPU class plausibly inferred from category for catalog deployments.
+function gpuForCategory(category: AppCategory): string | null {
+  if (category === "Language" || category === "Speech") return "A100 40GB";
+  if (
+    category === "Image Generation" ||
+    category === "Video Generation" ||
+    category === "Video Editing" ||
+    category === "Video Understanding" ||
+    category === "Live Transcoding"
+  )
+    return "L40S";
+  return null;
+}
+
+/**
+ * Ensure an app carries a deployment manifest. Returns the app unchanged if it
+ * already has one (the org's own apps); otherwise derives a plausible manifest
+ * from the catalog fields so every app is uniformly "a deployed pipeline".
+ */
+function withDerivedDeployment(a: App): App {
+  if (a.deployment) return a;
+  const kind: PipelineKind = a.realtime ? "live" : "batch";
+  const deployment: AppDeployment = {
+    pipelineId: a.id,
+    environmentId: "env-production",
+    kind,
+    status: "deployed",
+    visibility: "public",
+    entrypoint: `pipeline:${pascalCaseFromId(a.id)}`,
+    gpu: gpuForCategory(a.category),
+    image: `registry.livepeer.org/${slugFromProvider(a.provider)}/${a.id}:1.0.0`,
+    version: "1.0.0",
+    lastDeployedAt: CATALOG_DEPLOYED_AT,
+    createdBy: {
+      name: a.provider,
+      initials: providerInitials(a.provider),
+      color: "var(--color-blue-bright)",
+    },
+    warmOrchestrators: a.orchestrators,
+    calls7d: a.runs7d,
+    p50LatencyMs: a.latency,
+    errorRatePct: Math.max(0, 100 - a.uptime),
+    endpoints: a.realtime ? CATALOG_LIVE_ENDPOINTS : CATALOG_BATCH_ENDPOINTS,
+  };
+  return { ...a, deployment };
+}
 
 // ─── Models ───────────────────────────────────────────────────────────────────
 
-export const APPS: App[] = [
+// The third-party catalog models (everything not deployed by the org). Authored
+// without a deployment manifest; `withDerivedDeployment` attaches one below.
+const CATALOG_MODELS: App[] = [
   // ── Managed Services (SLA-backed) ──────────────────────────────────────────
   {
     id: "daydream-video",
@@ -1663,10 +1712,97 @@ High-performance text embedding model with 768 dimensions and 8192 token context
   },
 ];
 
+// The ONE unified catalog: third-party models (with a derived deployment) plus
+// the org's own deployed apps (manifest lifted from the legacy literal). Every
+// entry carries a `deployment`.
+export const APPS: App[] = [
+  ...CATALOG_MODELS.map(withDerivedDeployment),
+  ...LEGACY_DEPLOYMENTS.map(legacyToApp),
+];
+
+/** The one id-based lookup. Resolves any app — catalog model or owned app. */
+export function getAppById(id: string): App | undefined {
+  return APPS.find((a) => a.id === id);
+}
+
+/** @deprecated Use `getAppById`. Retained as a thin alias for legacy callers. */
 export function getModelById(id: string): App | undefined {
-  return APPS.find((m) => m.id === id);
+  return getAppById(id);
+}
+
+/** @deprecated Use `getAppById`. Retained as a thin alias for legacy callers. */
+export function getCapabilityById(id: string): App | undefined {
+  return getAppById(id);
+}
+
+/** @deprecated Use `getAppById`. Retained as a thin alias for legacy callers. */
+export function getPipelineById(id: string): App | undefined {
+  return getAppById(id);
+}
+
+// ─── App / deployment helpers ─────────────────────────────────────────────────
+// A pipeline's identity is its `deployment.pipelineId`; it can have a deployment
+// in each environment, so the same pipelineId may appear on more than one app
+// (the multi-env "Deployed in" pills). These resolve the deployment set and the
+// publish state across the unified `APPS` array.
+
+/** The org's own deployed apps. */
+export const PIPELINE_APP_IDS: ReadonlySet<string> = new Set(
+  APPS.filter((a) => a.provider === OWNED_APP_PROVIDER).map((a) => a.id),
+);
+
+/** All apps sharing a `pipelineId` — the per-environment deployments. */
+export function deploymentsForPipeline(pipelineId: string): App[] {
+  return APPS.filter((a) => a.deployment?.pipelineId === pipelineId);
+}
+
+// Publish state. A deployment's visibility is whether it is listed in Explore.
+// Seed visibility lives on each app's `deployment`; runtime toggles are
+// persisted as per-id overrides in localStorage so the Apps Settings tab and
+// the Explore grid agree across navigation. Client-only — guarded for SSR.
+const PIPELINE_VISIBILITY_KEY = "livepeer.pipelineVisibility";
+
+function readVisibilityOverrides(): Record<string, PipelineVisibility> {
+  if (typeof window === "undefined") return {};
+  try {
+    return JSON.parse(
+      localStorage.getItem(PIPELINE_VISIBILITY_KEY) || "{}",
+    ) as Record<string, PipelineVisibility>;
+  } catch {
+    return {};
+  }
+}
+
+export function effectiveVisibility(app: App): PipelineVisibility {
+  return readVisibilityOverrides()[app.id] ?? app.deployment?.visibility ?? "private";
+}
+
+export function setPipelineVisibility(
+  id: string,
+  visibility: PipelineVisibility,
+): void {
+  if (typeof window === "undefined") return;
+  const overrides = readVisibilityOverrides();
+  overrides[id] = visibility;
+  localStorage.setItem(PIPELINE_VISIBILITY_KEY, JSON.stringify(overrides));
 }
 
+/** The org's *public* deployed apps — listed in Explore alongside the catalog. */
+export function publicPipelines(): App[] {
+  return APPS.filter(
+    (a) =>
+      a.provider === OWNED_APP_PROVIDER && effectiveVisibility(a) === "public",
+  );
+}
+
+// SSR-safe seed: the org's public apps by their *seed* visibility only (no
+// localStorage). Used as the initial Explore state so server and first client
+// render agree; a useEffect then swaps in the localStorage-aware set.
+export const SEED_PUBLIC_PIPELINE_APPS: App[] = APPS.filter(
+  (a) =>
+    a.provider === OWNED_APP_PROVIDER && a.deployment?.visibility === "public",
+);
+
 // ─── Organizations (publisher profiles) ──────────────────────────────────────────
 // An organization is the publisher namespace behind an app's `provider`. Each gets a
 // public profile page at /orgs/[slug] listing its published apps — like a GitHub
@@ -1695,10 +1831,14 @@ function organizationInitials(name: string): string {
   return raw.toUpperCase();
 }
 
-// The full public catalog: static catalog apps + published pipelines (the same
-// set Explore lists). Organization pages slice this by provider.
+// The full public catalog: third-party catalog models + the org's *published*
+// apps (the same set Explore lists). Private owned apps are excluded.
+// Organization pages slice this by provider.
 function publicCatalog(): App[] {
-  return [...APPS, ...publicPipelines().map(pipelineToExploreApp)];
+  return APPS.filter(
+    (a) =>
+      a.provider !== OWNED_APP_PROVIDER || a.deployment?.visibility === "public",
+  );
 }
 
 export function appsForOrganization(slug: string): App[] {
diff --git a/lib/dashboard/org-fleet.ts b/lib/dashboard/org-fleet.ts
index 29ce9a1..3e5d969 100644
--- a/lib/dashboard/org-fleet.ts
+++ b/lib/dashboard/org-fleet.ts
@@ -1,13 +1,14 @@
-import { PIPELINES } from "./mock-data";
+import { APPS, PIPELINE_APP_IDS } from "./mock-data";
 import type { Pipeline } from "./types";
 
 /**
  * Single source of truth for "the org's apps" on Home.
  *
- * Pipelines can be deployed to more than one environment, so the raw PIPELINES
- * list contains the same app multiple times. Every Home surface needs the
- * *deduped* set and the same aggregate total — computing it in several places
- * is how the headline number and the table drift apart. Compute once, here.
+ * An app can be deployed to more than one environment, so the unified APPS list
+ * carries the same app (by `deployment.pipelineId`) more than once. Every Home
+ * surface needs the *deduped* set and the same aggregate total — computing it
+ * in several places is how the headline number and the table drift apart.
+ * Compute once, here.
  *
  * A deployed app's call count is a single public number (think package
  * downloads) — the network handles the calls; the org just published the app.
@@ -24,20 +25,28 @@ export interface OrgFleet {
 }
 
 export function getOrgFleet(): OrgFleet {
+  // The org's own deployed apps — every one carries a deployment manifest.
+  const owned = APPS.filter(
+    (a): a is Pipeline => PIPELINE_APP_IDS.has(a.id) && !!a.deployment,
+  );
+
   const seen = new Set<string>();
-  const apps = PIPELINES.filter((p) => {
-    if (seen.has(p.pipelineId)) return false;
-    seen.add(p.pipelineId);
+  const apps = owned.filter((a) => {
+    if (seen.has(a.deployment.pipelineId)) return false;
+    seen.add(a.deployment.pipelineId);
     return true;
   });
 
   return {
     apps,
     count: apps.length,
-    deployed: apps.filter((a) => a.status === "deployed").length,
-    building: apps.filter((a) => a.status === "building").length,
-    errored: apps.filter((a) => a.status === "error").length,
-    totalCalls7d: apps.reduce((sum, a) => sum + (a.calls7d || 0), 0),
+    deployed: apps.filter((a) => a.deployment.status === "deployed").length,
+    building: apps.filter((a) => a.deployment.status === "building").length,
+    errored: apps.filter((a) => a.deployment.status === "error").length,
+    totalCalls7d: apps.reduce(
+      (sum, a) => sum + (a.deployment.calls7d || 0),
+      0,
+    ),
   };
 }
 
diff --git a/lib/dashboard/types.ts b/lib/dashboard/types.ts
index bfaf552..20d5cff 100644
--- a/lib/dashboard/types.ts
+++ b/lib/dashboard/types.ts
@@ -20,17 +20,20 @@ export interface Environment {
   isDefault?: boolean;
 }
 
-// ─── Apps (Pipelines) ────────────────────────────────────────────────────────
+// ─── Apps (deployed pipelines) ──────────────────────────────────────────────
 //
-// An App is a deployed Pipeline — the unit a builder pushes with the Runner SDK
-// (`livepeer push` against a `livepeer.yaml`, identified by `pipelineId`). It is
-// the Livepeer analog of a Modal "App": a named, deployed capability that lives
-// inside an Environment. Two transport kinds mirror the SDK's two base classes:
+// There is ONE app type. An app IS a deployed pipeline — the unit a builder
+// pushes with the Runner SDK (`livepeer push` against a `livepeer.yaml`,
+// identified by `pipelineId`). It is the Livepeer analog of a Modal "App": a
+// named, deployed capability that lives inside an Environment. Its deployment /
+// pipeline manifest hangs off `app.deployment` (an `AppDeployment`); the
+// catalog-facing fields (name, provider, pricing, latency, …) live at the top
+// level on `App`. Two transport kinds mirror the SDK's two base classes:
 //   - "batch"  → `Pipeline`      (POST /predict, request/response or SSE)
 //   - "live"   → `LivePipeline`  (trickle, POST /stream/{start,stop,params})
 //
-// Visibility is binary and identical to Explore-presence: a "public" pipeline IS
-// listed in the Explore catalog; a "private" one runs only for its own keys.
+// Visibility is binary and identical to Explore-presence: a "public" deployment
+// IS listed in the Explore catalog; a "private" one runs only for its own keys.
 
 export type PipelineKind = "batch" | "live";
 
@@ -48,10 +51,13 @@ export interface PipelineEndpoint {
   description?: string;
 }
 
-export interface Pipeline {
-  id: string;
-  /** Display name, e.g. "Sentiment". */
-  name: string;
+/**
+ * The pipeline/deployment manifest for an app. Holds everything specific to a
+ * single deployed instance — its Runner SDK identity, environment, build, and
+ * live operational metrics. Catalog-facing fields (name, provider, pricing,
+ * latency, …) live on `App` itself; this is the operator-facing manifest.
+ */
+export interface AppDeployment {
   /** Runner SDK identifier from livepeer.yaml, e.g. "sentiment". */
   pipelineId: string;
   /** Environment this deployment lives in. */
@@ -59,8 +65,6 @@ export interface Pipeline {
   kind: PipelineKind;
   status: PipelineStatusKind;
   visibility: PipelineVisibility;
-  /** One-line summary, shown in the list and (when public) on the Explore card. */
-  description: string;
   /** module:class entrypoint from the manifest, e.g. "pipeline:Sentiment". */
   entrypoint: string;
   /** GPU class from the manifest, or null for CPU pipelines. */
@@ -79,12 +83,15 @@ export interface Pipeline {
   errorRatePct: number;
   /** HTTP surface the orchestrator hits — drives the Overview "Endpoints" list. */
   endpoints: PipelineEndpoint[];
-  /** Category used for the Explore card when public. */
-  category: AppCategory;
-  /** List price + unit, used on the Explore card when public. */
-  price: { amount: number; unit: PricingUnit };
 }
 
+/**
+ * Transitional alias: an app that definitely carries its deployment manifest.
+ * Lets the operator components keep their `app: Pipeline` prop types while the
+ * codebase migrates manifest reads to `app.deployment.X`.
+ */
+export type Pipeline = App & { deployment: AppDeployment };
+
 export type AppCategory =
   | "Video Generation"
   | "Video Editing"
@@ -187,6 +194,9 @@ export interface App {
   };
   playgroundConfig?: PlaygroundConfig;
   readme?: string;
+  /** The pipeline/deployment manifest. Present once the app is deployed; the
+   *  org's own apps and (in the mock) every catalog app carry one. */
+  deployment?: AppDeployment;
 }
 
 /**