diff --git a/src/components/marketplace/PublishTeamModal.tsx b/src/components/marketplace/PublishTeamModal.tsx
new file mode 100644
index 0000000..d46b581
--- /dev/null
+++ b/src/components/marketplace/PublishTeamModal.tsx
@@ -0,0 +1,227 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (C) 2026 CrewForm
+
+import { useState, useEffect } from 'react'
+import { X, Upload, Loader2, Plus, Tag, FileText, Eye, Edit3 } from 'lucide-react'
+import { toast } from 'sonner'
+import { useAuth } from '@/hooks/useAuth'
+import { useSubmitTeam } from '@/hooks/useMarketplace'
+import type { Team } from '@/types'
+
+interface PublishTeamModalProps {
+    team: Team | null
+    onClose: () => void
+}
+
+const SUGGESTED_TAGS = [
+    'productivity', 'writing', 'coding', 'research', 'marketing',
+    'data-analysis', 'customer-support', 'pipeline', 'orchestrator',
+    'collaboration', 'automation', 'devops', 'sales', 'creative',
+]
+
+export function PublishTeamModal({ team, onClose }: PublishTeamModalProps) {
+    const { user } = useAuth()
+    const submitMutation = useSubmitTeam()
+    const [tags, setTags] = useState<string[]>([])
+    const [newTag, setNewTag] = useState('')
+    const [readme, setReadme] = useState('')
+    const [readmePreview, setReadmePreview] = useState(false)
+
+    // Pre-fill existing tags
+    useEffect(() => {
+        if (team?.marketplace_tags && team.marketplace_tags.length > 0) {
+            setTags(team.marketplace_tags)
+        } else {
+            setTags([])
+        }
+    }, [team?.marketplace_tags])
+
+    // Pre-fill existing README
+    useEffect(() => {
+        setReadme(team?.marketplace_readme ?? '')
+    }, [team?.marketplace_readme])
+
+    if (!team) return null
+
+    const addTag = (tag: string) => {
+        const normalized = tag.toLowerCase().trim()
+        if (normalized && !tags.includes(normalized)) {
+            setTags((prev) => [...prev, normalized])
+        }
+        setNewTag('')
+    }
+
+    const removeTag = (tag: string) => {
+        setTags((prev) => prev.filter((t) => t !== tag))
+    }
+
+    const handleSubmit = () => {
+        if (!user) return
+        submitMutation.mutate(
+            { teamId: team.id, tags, readme, userId: user.id },
+            {
+                onSuccess: () => {
+                    toast.success('Team submitted for review! You\'ll be notified when it\'s approved.')
+                    onClose()
+                },
+            },
+        )
+    }
+
+    return (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4">
+            <div className="w-full max-w-lg rounded-xl border border-border bg-surface-primary shadow-2xl">
+                {/* Header */}
+                <div className="flex items-center justify-between border-b border-border px-5 py-4">
+                    <div className="flex items-center gap-2">
+                        <Upload className="h-5 w-5 text-brand-primary" />
+                        <h2 className="text-lg font-semibold text-gray-100">Publish Team to Marketplace</h2>
+                    </div>
+                    <button type="button" onClick={onClose} className="rounded-lg p-1 text-gray-500 hover:text-gray-300">
+                        <X className="h-5 w-5" />
+                    </button>
+                </div>
+
+                <div className="space-y-5 p-5">
+                    {/* Team info */}
+                    <div className="rounded-lg border border-border bg-surface-card p-3">
+                        <p className="text-sm font-medium text-gray-200">{team.name}</p>
+                        <p className="mt-1 text-xs text-gray-500">{team.description}</p>
+                        <span className="mt-2 inline-block rounded-full bg-surface-overlay px-2 py-0.5 text-[10px] font-medium text-gray-400 capitalize">
+                            {team.mode} mode
+                        </span>
+                    </div>
+
+                    {/* Note about included agents */}
+                    <div className="rounded-lg border border-blue-500/20 bg-blue-500/5 px-4 py-3">
+                        <p className="text-xs text-blue-300">
+                            All member agents will be included in the published team. Users who install this team
+                            will receive copies of each agent with their configurations.
+                        </p>
+                    </div>
+
+                    {/* README */}
+                    <div>
+                        <div className="mb-2 flex items-center justify-between">
+                            <label className="flex items-center gap-1 text-xs font-medium text-gray-400">
+                                <FileText className="h-3 w-3" />
+                                README (optional — Markdown supported)
+                            </label>
+                            {readme.trim() && (
+                                <button
+                                    type="button"
+                                    onClick={() => setReadmePreview(!readmePreview)}
+                                    className="flex items-center gap-1 text-[10px] text-gray-500 hover:text-gray-300"
+                                >
+                                    {readmePreview ? <Edit3 className="h-3 w-3" /> : <Eye className="h-3 w-3" />}
+                                    {readmePreview ? 'Edit' : 'Preview'}
+                                </button>
+                            )}
+                        </div>
+                        {readmePreview ? (
+                            <div
+                                className="prose prose-invert prose-sm max-w-none rounded-lg border border-border bg-surface-card p-3 text-gray-300"
+                                dangerouslySetInnerHTML={{ __html: readme
+                                    .replace(/^### (.*$)/gm, '<h4 class="text-gray-200 text-sm font-semibold mt-3 mb-1">$1</h4>')
+                                    .replace(/^## (.*$)/gm, '<h3 class="text-gray-100 text-sm font-bold mt-4 mb-1">$1</h3>')
+                                    .replace(/^# (.*$)/gm, '<h2 class="text-gray-100 text-base font-bold mt-4 mb-2">$1</h2>')
+                                    .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
+                                    .replace(/\*(.*?)\*/g, '<em>$1</em>')
+                                    .replace(/`(.*?)`/g, '<code class="rounded bg-surface-overlay px-1 py-0.5 text-[11px] text-brand-primary">$1</code>')
+                                    .replace(/^- (.*$)/gm, '<li class="ml-4 list-disc text-xs text-gray-400">$1</li>')
+                                    .replace(/\n/g, '<br />')
+                                }}
+                            />
+                        ) : (
+                            <textarea
+                                value={readme}
+                                onChange={(e) => setReadme(e.target.value)}
+                                placeholder={`## What This Team Does\n\nDescribe the team workflow...\n\n## Use Cases\n\n- Research → Write → Review pipeline\n- Customer support escalation\n\n## Included Agents\n\n- Agent 1: Researcher\n- Agent 2: Writer`}
+                                rows={6}
+                                className="w-full rounded-lg border border-border bg-surface-card px-3 py-2 text-xs text-gray-200 placeholder-gray-600 outline-none focus:border-brand-primary font-mono"
+                            />
+                        )}
+                    </div>
+
+                    {/* Tags */}
+                    <div>
+                        <label className="mb-2 block text-xs font-medium text-gray-400">
+                            <Tag className="mr-1 inline h-3 w-3" />
+                            Tags (at least 1 required)
+                        </label>
+
+                        <div className="mb-2 flex flex-wrap gap-1.5">
+                            {tags.map((tag) => (
+                                <span
+                                    key={tag}
+                                    className="flex items-center gap-1 rounded-md bg-brand-primary/10 px-2 py-0.5 text-xs font-medium text-brand-primary"
+                                >
+                                    {tag}
+                                    <button type="button" onClick={() => removeTag(tag)} className="hover:text-red-400">
+                                        <X className="h-3 w-3" />
+                                    </button>
+                                </span>
+                            ))}
+                        </div>
+
+                        <div className="flex gap-2">
+                            <input
+                                type="text"
+                                value={newTag}
+                                onChange={(e) => setNewTag(e.target.value)}
+                                onKeyDown={(e) => e.key === 'Enter' && addTag(newTag)}
+                                placeholder="Add a tag..."
+                                className="flex-1 rounded-lg border border-border bg-surface-card px-3 py-1.5 text-xs text-gray-200 outline-none focus:border-brand-primary"
+                            />
+                            <button
+                                type="button"
+                                onClick={() => addTag(newTag)}
+                                disabled={!newTag.trim()}
+                                className="rounded-lg border border-border px-2 py-1.5 text-xs text-gray-400 hover:bg-surface-elevated disabled:opacity-30"
+                            >
+                                <Plus className="h-3 w-3" />
+                            </button>
+                        </div>
+
+                        <div className="mt-2 flex flex-wrap gap-1">
+                            {SUGGESTED_TAGS.filter((t) => !tags.includes(t)).slice(0, 8).map((tag) => (
+                                <button
+                                    key={tag}
+                                    type="button"
+                                    onClick={() => addTag(tag)}
+                                    className="rounded-md border border-border px-2 py-0.5 text-[10px] text-gray-500 hover:border-brand-primary hover:text-brand-primary"
+                                >
+                                    + {tag}
+                                </button>
+                            ))}
+                        </div>
+                    </div>
+                </div>
+
+                {/* Footer */}
+                <div className="flex items-center justify-end gap-2 border-t border-border px-5 py-3">
+                    <button
+                        type="button"
+                        onClick={onClose}
+                        className="rounded-lg border border-border px-4 py-2 text-xs font-medium text-gray-400 hover:text-gray-200"
+                    >
+                        Cancel
+                    </button>
+                    <button
+                        type="button"
+                        onClick={handleSubmit}
+                        disabled={tags.length === 0 || submitMutation.isPending}
+                        className="flex items-center gap-1.5 rounded-lg bg-brand-primary px-4 py-2 text-xs font-semibold text-black transition-colors hover:bg-brand-hover disabled:opacity-50"
+                    >
+                        {submitMutation.isPending ? (
+                            <Loader2 className="h-3 w-3 animate-spin" />
+                        ) : (
+                            <Upload className="h-3 w-3" />
+                        )}
+                        Submit for Review
+                    </button>
+                </div>
+            </div>
+        </div>
+    )
+}
diff --git a/src/components/marketplace/TeamCard.tsx b/src/components/marketplace/TeamCard.tsx
new file mode 100644
index 0000000..381a95c
--- /dev/null
+++ b/src/components/marketplace/TeamCard.tsx
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (C) 2026 CrewForm
+
+import { Star, Download, GitBranch, Users, Zap } from 'lucide-react'
+import type { Team } from '@/types'
+
+interface TeamCardProps {
+    team: Team
+    onClick: (team: Team) => void
+}
+
+const modeConfig: Record<string, { label: string; color: string; icon: typeof GitBranch }> = {
+    pipeline: { label: 'Pipeline', color: 'bg-blue-500/10 text-blue-400', icon: GitBranch },
+    orchestrator: { label: 'Orchestrator', color: 'bg-purple-500/10 text-purple-400', icon: Zap },
+    collaboration: { label: 'Collaboration', color: 'bg-green-500/10 text-green-400', icon: Users },
+}
+
+export function TeamCard({ team, onClick }: TeamCardProps) {
+    const mode = modeConfig[team.mode] ?? modeConfig.pipeline
+    const ModeIcon = mode.icon
+
+    // Count agents in team config
+    const agentCount = getTeamAgentCount(team)
+
+    return (
+        <button
+            type="button"
+            onClick={() => onClick(team)}
+            className="group w-full rounded-xl border border-border bg-surface-card p-5 text-left transition-all hover:border-brand-primary/40 hover:shadow-lg hover:shadow-brand-primary/5"
+        >
+            {/* Header */}
+            <div className="mb-3 flex items-start justify-between">
+                <div className="flex-1 min-w-0">
+                    <h3 className="truncate text-base font-semibold text-gray-100 group-hover:text-brand-primary transition-colors">
+                        {team.name}
+                    </h3>
+                    <div className="mt-1 flex items-center gap-2">
+                        <span className={`inline-flex items-center gap-1 rounded-full px-2 py-0.5 text-xs font-medium ${mode.color}`}>
+                            <ModeIcon className="h-3 w-3" />
+                            {mode.label}
+                        </span>
+                        <span className="text-xs text-gray-500">
+                            {agentCount} agent{agentCount !== 1 ? 's' : ''}
+                        </span>
+                    </div>
+                </div>
+            </div>
+
+            {/* Description */}
+            <p className="mb-3 line-clamp-2 text-sm text-gray-400">
+                {team.description}
+            </p>
+
+            {/* Tags */}
+            <div className="mb-3 flex flex-wrap gap-1.5">
+                {team.marketplace_tags.map((tag) => (
+                    <span
+                        key={tag}
+                        className="rounded-md bg-surface-overlay px-2 py-0.5 text-xs text-gray-400"
+                    >
+                        {tag}
+                    </span>
+                ))}
+            </div>
+
+            {/* Stats */}
+            <div className="flex items-center gap-4 text-xs text-gray-500">
+                <span className="flex items-center gap-1">
+                    <Download className="h-3.5 w-3.5" />
+                    {team.install_count.toLocaleString()}
+                </span>
+                <span className="flex items-center gap-1">
+                    <Star className="h-3.5 w-3.5 text-amber-400" />
+                    {team.rating_avg.toFixed(1)}
+                </span>
+                <span className="ml-auto text-gray-600 capitalize">{team.mode}</span>
+            </div>
+        </button>
+    )
+}
+
+function getTeamAgentCount(team: Team): number {
+    const config = team.config
+    const ids = new Set<string>()
+
+    if ('steps' in config) {
+        for (const step of config.steps) {
+            ids.add(step.agent_id)
+            if (step.parallel_agents) step.parallel_agents.forEach(id => ids.add(id))
+            if (step.merge_agent_id) ids.add(step.merge_agent_id)
+        }
+    }
+    if ('brain_agent_id' in config && config.brain_agent_id) ids.add(config.brain_agent_id)
+    if ('worker_agent_ids' in config && Array.isArray(config.worker_agent_ids)) {
+        config.worker_agent_ids.forEach(id => ids.add(id))
+    }
+    if ('agent_ids' in config && Array.isArray(config.agent_ids)) {
+        config.agent_ids.forEach((id: string) => ids.add(id))
+    }
+
+    return ids.size || 1
+}
diff --git a/src/components/marketplace/TeamDetailModal.tsx b/src/components/marketplace/TeamDetailModal.tsx
new file mode 100644
index 0000000..9f33aeb
--- /dev/null
+++ b/src/components/marketplace/TeamDetailModal.tsx
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (C) 2026 CrewForm
+
+import { X, Download, Star, GitBranch, Users, Zap, Loader2 } from 'lucide-react'
+import type { Team } from '@/types'
+import { cn } from '@/lib/utils'
+
+interface TeamDetailModalProps {
+    team: Team | null
+    onClose: () => void
+    onInstall: (team: Team) => void
+    isInstalling: boolean
+}
+
+const modeConfig: Record<string, { label: string; color: string; icon: typeof GitBranch; description: string }> = {
+    pipeline: {
+        label: 'Pipeline',
+        color: 'bg-blue-500/10 text-blue-400 border-blue-500/20',
+        icon: GitBranch,
+        description: 'Agents execute sequentially — each passes output to the next.',
+    },
+    orchestrator: {
+        label: 'Orchestrator',
+        color: 'bg-purple-500/10 text-purple-400 border-purple-500/20',
+        icon: Zap,
+        description: 'A brain agent delegates sub-tasks to workers and assembles the result.',
+    },
+    collaboration: {
+        label: 'Collaboration',
+        color: 'bg-green-500/10 text-green-400 border-green-500/20',
+        icon: Users,
+        description: 'Agents discuss in a shared thread and converge on a consensus.',
+    },
+}
+
+export function TeamDetailModal({ team, onClose, onInstall, isInstalling }: TeamDetailModalProps) {
+    if (!team) return null
+
+    const mode = modeConfig[team.mode] ?? modeConfig.pipeline
+    const ModeIcon = mode.icon
+
+    // Count agents
+    const agentCount = getAgentCount(team)
+
+    return (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" onClick={onClose}>
+            <div
+                className="w-full max-w-lg rounded-xl border border-border bg-surface-primary shadow-2xl max-h-[80vh] flex flex-col"
+                onClick={(e) => e.stopPropagation()}
+            >
+                {/* Header */}
+                <div className="flex items-center justify-between border-b border-border px-5 py-4 shrink-0">
+                    <div className="flex-1 min-w-0">
+                        <h2 className="truncate text-lg font-semibold text-gray-100">{team.name}</h2>
+                        <div className="mt-1 flex items-center gap-2">
+                            <span className={cn('inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-xs font-medium', mode.color)}>
+                                <ModeIcon className="h-3 w-3" />
+                                {mode.label}
+                            </span>
+                            <span className="text-xs text-gray-500">{agentCount} agent{agentCount !== 1 ? 's' : ''}</span>
+                        </div>
+                    </div>
+                    <button type="button" onClick={onClose} className="rounded-lg p-1 text-gray-500 hover:text-gray-300">
+                        <X className="h-5 w-5" />
+                    </button>
+                </div>
+
+                {/* Body */}
+                <div className="overflow-y-auto flex-1 p-5 space-y-4">
+                    {/* Description */}
+                    <p className="text-sm text-gray-400 leading-relaxed">{team.description}</p>
+
+                    {/* Mode info */}
+                    <div className={cn('rounded-lg border p-3', mode.color)}>
+                        <p className="text-xs">{mode.description}</p>
+                    </div>
+
+                    {/* Stats */}
+                    <div className="flex gap-6">
+                        <div>
+                            <p className="text-xs text-gray-500">Installs</p>
+                            <p className="flex items-center gap-1 text-sm font-medium text-gray-200">
+                                <Download className="h-3.5 w-3.5 text-gray-400" />
+                                {team.install_count.toLocaleString()}
+                            </p>
+                        </div>
+                        <div>
+                            <p className="text-xs text-gray-500">Rating</p>
+                            <p className="flex items-center gap-1 text-sm font-medium text-gray-200">
+                                <Star className="h-3.5 w-3.5 text-amber-400" />
+                                {team.rating_avg.toFixed(1)}
+                            </p>
+                        </div>
+                    </div>
+
+                    {/* Tags */}
+                    {team.marketplace_tags.length > 0 && (
+                        <div className="flex flex-wrap gap-1.5">
+                            {team.marketplace_tags.map((tag) => (
+                                <span key={tag} className="rounded-md bg-surface-overlay px-2 py-0.5 text-xs text-gray-400">
+                                    {tag}
+                                </span>
+                            ))}
+                        </div>
+                    )}
+
+                    {/* README */}
+                    {team.marketplace_readme && (
+                        <div className="rounded-lg border border-border bg-surface-card p-4">
+                            <div
+                                className="prose prose-invert prose-sm max-w-none text-gray-300"
+                                dangerouslySetInnerHTML={{
+                                    __html: team.marketplace_readme
+                                        .replace(/^### (.*$)/gm, '<h4 class="text-gray-200 text-sm font-semibold mt-3 mb-1">$1</h4>')
+                                        .replace(/^## (.*$)/gm, '<h3 class="text-gray-100 text-sm font-bold mt-4 mb-1">$1</h3>')
+                                        .replace(/^# (.*$)/gm, '<h2 class="text-gray-100 text-base font-bold mt-4 mb-2">$1</h2>')
+                                        .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
+                                        .replace(/\*(.*?)\*/g, '<em>$1</em>')
+                                        .replace(/`(.*?)`/g, '<code class="rounded bg-surface-overlay px-1 py-0.5 text-[11px] text-brand-primary">$1</code>')
+                                        .replace(/^- (.*$)/gm, '<li class="ml-4 list-disc text-xs text-gray-400">$1</li>')
+                                        .replace(/\n/g, '<br />'),
+                                }}
+                            />
+                        </div>
+                    )}
+                </div>
+
+                {/* Footer */}
+                <div className="flex items-center justify-between border-t border-border px-5 py-3 shrink-0">
+                    <p className="text-xs text-gray-500">
+                        Installing will clone this team and its {agentCount} agent{agentCount !== 1 ? 's' : ''} into your workspace.
+                    </p>
+                    <button
+                        type="button"
+                        onClick={() => onInstall(team)}
+                        disabled={isInstalling}
+                        className="flex items-center gap-1.5 rounded-lg bg-brand-primary px-4 py-2 text-xs font-semibold text-black transition-colors hover:bg-brand-hover disabled:opacity-50"
+                    >
+                        {isInstalling ? (
+                            <Loader2 className="h-3.5 w-3.5 animate-spin" />
+                        ) : (
+                            <Download className="h-3.5 w-3.5" />
+                        )}
+                        Install Team
+                    </button>
+                </div>
+            </div>
+        </div>
+    )
+}
+
+function getAgentCount(team: Team): number {
+    const config = team.config
+    const ids = new Set<string>()
+    if ('steps' in config) {
+        for (const step of config.steps) {
+            ids.add(step.agent_id)
+            if (step.parallel_agents) step.parallel_agents.forEach(id => ids.add(id))
+            if (step.merge_agent_id) ids.add(step.merge_agent_id)
+        }
+    }
+    if ('brain_agent_id' in config && config.brain_agent_id) ids.add(config.brain_agent_id)
+    if ('worker_agent_ids' in config && Array.isArray(config.worker_agent_ids)) config.worker_agent_ids.forEach(id => ids.add(id))
+    if ('agent_ids' in config && Array.isArray(config.agent_ids)) config.agent_ids.forEach((id: string) => ids.add(id))
+    return ids.size || 1
+}
diff --git a/src/db/installTeam.ts b/src/db/installTeam.ts
new file mode 100644
index 0000000..8f1640d
--- /dev/null
+++ b/src/db/installTeam.ts
@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// Copyright (C) 2026 CrewForm
+
+import { supabase } from '@/lib/supabase'
+import { enforceQuota } from '@/lib/enforceQuota'
+import { importTeam } from '@/lib/exportImport'
+import type { Team, TeamMember, Agent } from '@/types'
+import type { TeamExport, AgentExport } from '@/lib/exportImport'
+
+export interface TeamInstallResult {
+    clonedTeamId: string
+    installId: string
+}
+
+/**
+ * Install a marketplace team into the user's workspace.
+ *
+ * 1. Fetch source team + members + agents
+ * 2. Build a TeamExport object (same format as exportImport.ts)
+ * 3. Use importTeam() to clone everything with ID remapping
+ * 4. Increment source team's install_count
+ * 5. Record in team_installs
+ */
+export async function installMarketplaceTeam(
+    teamId: string,
+    workspaceId: string,
+    userId: string,
+): Promise<TeamInstallResult> {
+    // 1. Fetch source team
+    const result = await supabase
+        .from('teams')
+        .select('*')
+        .eq('id', teamId)
+        .eq('is_published', true)
+        .single()
+
+    if (result.error || !result.data) {
+        throw new Error('Team not found or is not published')
+    }
+
+    const sourceTeam = result.data as Team
+
+
+
+    // Check team quota before cloning
+    await enforceQuota(workspaceId, 'teams')
+
+    // 2. Fetch team members
+    const { data: membersData, error: membersError } = await supabase
+        .from('team_members')
+        .select('*')
+        .eq('team_id', teamId)
+        .order('position', { ascending: true })
+
+    if (membersError) throw new Error(`Failed to fetch team members: ${membersError.message}`)
+    const members = membersData as TeamMember[]
+
+    // 3. Collect all referenced agent IDs
+    const agentIds = new Set<string>()
+    for (const m of members) agentIds.add(m.agent_id)
+
+    const config = sourceTeam.config
+    if ('steps' in config) {
+        for (const step of config.steps) {
+            agentIds.add(step.agent_id)
+            if (step.reviewer_agent_id) agentIds.add(step.reviewer_agent_id)
+            if (step.parallel_agents) step.parallel_agents.forEach(id => agentIds.add(id))
+            if (step.merge_agent_id) agentIds.add(step.merge_agent_id)
+        }
+    }
+    if ('brain_agent_id' in config && config.brain_agent_id) agentIds.add(config.brain_agent_id)
+    if ('worker_agent_ids' in config && Array.isArray(config.worker_agent_ids)) {
+        config.worker_agent_ids.forEach(id => agentIds.add(id))
+    }
+    if ('agent_ids' in config && Array.isArray(config.agent_ids)) {
+        config.agent_ids.forEach((id: string) => agentIds.add(id))
+    }
+    if ('facilitator_agent_id' in config && typeof config.facilitator_agent_id === 'string') {
+        agentIds.add(config.facilitator_agent_id)
+    }
+
+    // 4. Fetch all agents
+    const { data: agentsData, error: agentsError } = await supabase
+        .from('agents')
+        .select('*')
+        .in('id', Array.from(agentIds))
+
+    if (agentsError) throw new Error(`Failed to fetch agents: ${agentsError.message}`)
+    const agents = agentsData as Agent[]
+    const agentMap = new Map(agents.map(a => [a.id, a]))
+
+    // 5. Build TeamExport for importTeam()
+    const agentEntries: TeamExport['agents'] = []
+    const includedIds = new Set<string>()
+
+    for (const m of members) {
+        const agent = agentMap.get(m.agent_id)
+        if (!agent) continue
+        includedIds.add(m.agent_id)
+        agentEntries.push({
+            ref_id: m.agent_id,
+            role: m.role,
+            position: m.position,
+            agent: agentToExport(agent),
+        })
+    }
+
+    // Add config-only agents not in members
+    for (const id of agentIds) {
+        if (includedIds.has(id)) continue
+        const agent = agentMap.get(id)
+        if (!agent) continue
+        agentEntries.push({
+            ref_id: id,
+            role: 'worker',
+            position: agentEntries.length,
+            agent: agentToExport(agent),
+        })
+    }
+
+    const teamExport: TeamExport = {
+        name: sourceTeam.name,
+        description: sourceTeam.description,
+        mode: sourceTeam.mode,
+        config: sourceTeam.config,
+        agents: agentEntries,
+    }
+
+    // 6. Import team (handles agent cloning + ID remapping)
+    const clonedTeamId = await importTeam(workspaceId, teamExport)
+
+    // 7. Increment source team's install_count
+    await supabase.rpc('increment_team_install_count', { team_row_id: teamId }).then(({ error }) => {
+        if (error) console.error('[InstallTeam] Failed to increment install_count:', error.message)
+    })
+
+    // 8. Record in team_installs
+    const installResult = await supabase
+        .from('team_installs')
+        .insert({
+            team_id: teamId,
+            workspace_id: workspaceId,
+            installed_by: userId,
+            source_workspace_id: sourceTeam.workspace_id,
+            cloned_team_id: clonedTeamId,
+        })
+        .select('id')
+        .single()
+
+    if (installResult.error) {
+        console.error('[InstallTeam] Failed to record install:', installResult.error.message)
+    }
+
+    return {
+        clonedTeamId,
+        installId: (installResult.data as { id: string } | null)?.id ?? '',
+    }
+}
+
+function agentToExport(agent: Agent): AgentExport {
+    return {
+        name: agent.name,
+        description: agent.description,
+        model: agent.model,
+        fallback_model: agent.fallback_model,
+        provider: agent.provider,
+        system_prompt: agent.system_prompt, // Include prompts — team needs to be functional
+        temperature: agent.temperature,
+        max_tokens: agent.max_tokens,
+        tags: agent.tags,
+        tools: agent.tools,
+        voice_profile: agent.voice_profile,
+        config: agent.config,
+    }
+}
diff --git a/src/db/marketplace.ts b/src/db/marketplace.ts
index bff70e1..9c71cb6 100644
--- a/src/db/marketplace.ts
+++ b/src/db/marketplace.ts
@@ -2,7 +2,7 @@
 // Copyright (C) 2026 CrewForm
 
 import { supabase } from '@/lib/supabase'
-import type { Agent } from '@/types'
+import type { Agent, Team } from '@/types'
 
 export type MarketplaceSortOption = 'installs' | 'rating' | 'newest'
 
@@ -654,3 +654,193 @@ export async function fetchUserReview(
     if (result.error) throw result.error
     return result.data as AgentReview | null
 }
+
+// ═══════════════════════════════════════════════════════════════════════════
+// TEAM MARKETPLACE
+// ═══════════════════════════════════════════════════════════════════════════
+
+const MARKETPLACE_TEAM_COLUMNS = [
+    'id', 'workspace_id', 'name', 'description', 'mode',
+    'config', 'is_published', 'marketplace_tags',
+    'install_count', 'rating_avg', 'marketplace_readme',
+    'created_at', 'updated_at',
+].join(',')
+
+/** Fetch published marketplace teams with optional filtering and sorting */
+export async function fetchMarketplaceTeams(
+    options: MarketplaceQueryOptions = {},
+): Promise<Team[]> {
+    let query = supabase
+        .from('teams')
+        .select(MARKETPLACE_TEAM_COLUMNS)
+        .eq('is_published', true)
+
+    if (options.search?.trim()) {
+        const term = `%${options.search.trim()}%`
+        query = query.or(`name.ilike.${term},description.ilike.${term}`)
+    }
+
+    if (options.tags && options.tags.length > 0) {
+        query = query.contains('marketplace_tags', options.tags)
+    }
+
+    if (options.category) {
+        query = query.contains('marketplace_tags', [options.category])
+    }
+
+    switch (options.sort) {
+        case 'rating':
+            query = query.order('rating_avg', { ascending: false })
+            break
+        case 'newest':
+            query = query.order('created_at', { ascending: false })
+            break
+        case 'installs':
+        default:
+            query = query.order('install_count', { ascending: false })
+            break
+    }
+
+    const { data, error } = await query
+    if (error) throw error
+    return data as unknown as Team[]
+}
+
+/** Get all unique tags from published teams */
+export async function fetchMarketplaceTeamTags(): Promise<string[]> {
+    const { data, error } = await supabase
+        .from('teams')
+        .select('marketplace_tags')
+        .eq('is_published', true)
+
+    if (error) throw error
+
+    const tagSet = new Set<string>()
+    for (const row of data as Array<{ marketplace_tags: string[] }>) {
+        for (const tag of row.marketplace_tags) {
+            tagSet.add(tag)
+        }
+    }
+    return Array.from(tagSet).sort()
+}
+
+// ─── Team Publishing ────────────────────────────────────────────────────────
+
+/** Submit a team for marketplace review */
+export async function submitTeamForReview(
+    teamId: string,
+    tags: string[],
+    userId: string,
+    readme?: string,
+): Promise<MarketplaceSubmission> {
+    // Update team tags and readme
+    const updateFields: Record<string, unknown> = { marketplace_tags: tags }
+    if (readme !== undefined) {
+        updateFields.marketplace_readme = readme || null
+    }
+    const updateResult = await supabase
+        .from('teams')
+        .update(updateFields)
+        .eq('id', teamId)
+
+    if (updateResult.error) throw updateResult.error
+
+    // Create submission (team_id instead of agent_id)
+    const result = await supabase
+        .from('marketplace_submissions')
+        .insert({
+            team_id: teamId,
+            submitted_by: userId,
+            injection_scan_result: { safe: true, flags: [] }, // No prompt scan needed for teams
+        })
+        .select()
+        .single()
+
+    if (result.error) throw result.error
+    return result.data as MarketplaceSubmission
+}
+
+/** Approve a team submission and publish the team */
+export async function approveTeamSubmission(id: string, reviewerId: string): Promise<void> {
+    const subResult = await supabase
+        .from('marketplace_submissions')
+        .select('team_id')
+        .eq('id', id)
+        .single()
+
+    if (subResult.error) throw subResult.error
+    const teamId = (subResult.data as { team_id: string }).team_id
+
+    const updateResult = await supabase
+        .from('marketplace_submissions')
+        .update({
+            status: 'approved',
+            reviewed_by: reviewerId,
+            reviewed_at: new Date().toISOString(),
+        })
+        .eq('id', id)
+
+    if (updateResult.error) throw updateResult.error
+
+    const publishResult = await supabase
+        .from('teams')
+        .update({ is_published: true })
+        .eq('id', teamId)
+
+    if (publishResult.error) throw publishResult.error
+}
+
+/** Unpublish a team from the marketplace */
+export async function unpublishTeam(teamId: string): Promise<void> {
+    const result = await supabase
+        .from('teams')
+        .update({ is_published: false })
+        .eq('id', teamId)
+
+    if (result.error) throw result.error
+}
+
+// ─── Team Ratings ───────────────────────────────────────────────────────────
+
+export interface TeamReview {
+    id: string
+    team_id: string
+    user_id: string
+    rating: number
+    review_text: string
+    created_at: string
+    updated_at: string
+}
+
+/** Submit or update a rating for a marketplace team */
+export async function submitTeamRating(
+    teamId: string,
+    userId: string,
+    workspaceId: string,
+    rating: number,
+    reviewText: string = '',
+): Promise<TeamReview> {
+    const result = await supabase
+        .from('team_reviews')
+        .upsert(
+            { team_id: teamId, user_id: userId, workspace_id: workspaceId, rating, review_text: reviewText },
+            { onConflict: 'team_id,user_id' },
+        )
+        .select()
+        .single()
+
+    if (result.error) throw result.error
+    return result.data as TeamReview
+}
+
+/** Fetch all reviews for a team */
+export async function fetchTeamReviews(teamId: string): Promise<TeamReview[]> {
+    const result = await supabase
+        .from('team_reviews')
+        .select('*')
+        .eq('team_id', teamId)
+        .order('created_at', { ascending: false })
+
+    if (result.error) throw result.error
+    return result.data as TeamReview[]
+}
diff --git a/src/hooks/useMarketplace.ts b/src/hooks/useMarketplace.ts
index 5bae5de..5b9990a 100644
--- a/src/hooks/useMarketplace.ts
+++ b/src/hooks/useMarketplace.ts
@@ -7,9 +7,13 @@ import {
     submitAgentForReview, fetchMySubmissions, fetchPendingSubmissions,
     approveSubmission, rejectSubmission, fetchCreatorStats,
     submitAgentRating, fetchAgentReviews,
+    fetchMarketplaceTeams, fetchMarketplaceTeamTags,
+    submitTeamForReview, submitTeamRating, fetchTeamReviews,
 } from '@/db/marketplace'
-import type { MarketplaceQueryOptions, MarketplaceSubmission, CreatorStats, AgentReview } from '@/db/marketplace'
-import type { Agent } from '@/types'
+import { installMarketplaceTeam } from '@/db/installTeam'
+import type { MarketplaceQueryOptions, MarketplaceSubmission, CreatorStats, AgentReview, TeamReview } from '@/db/marketplace'
+import type { TeamInstallResult } from '@/db/installTeam'
+import type { Agent, Team } from '@/types'
 
 const STALE_TIME = 5 * 60 * 1000 // 5 minutes — marketplace data doesn't change often
 
@@ -23,6 +27,16 @@ export function useMarketplaceAgents(options: MarketplaceQueryOptions) {
     return { agents: data, isLoading, error, refetch }
 }
 
+/** Fetch marketplace teams with search, tag filter, and sort */
+export function useMarketplaceTeams(options: MarketplaceQueryOptions) {
+    const { data = [], isLoading, error, refetch } = useQuery<Team[]>({
+        queryKey: ['marketplace-teams', options.search, options.tags, options.category, options.sort],
+        queryFn: () => fetchMarketplaceTeams(options),
+        staleTime: STALE_TIME,
+    })
+    return { teams: data, isLoading, error, refetch }
+}
+
 /** Fetch all unique marketplace tags for the filter UI */
 export function useMarketplaceTags() {
     const { data = [], isLoading } = useQuery<string[]>({
@@ -33,6 +47,16 @@ export function useMarketplaceTags() {
     return { tags: data, isLoading }
 }
 
+/** Fetch all unique team marketplace tags */
+export function useMarketplaceTeamTags() {
+    const { data = [], isLoading } = useQuery<string[]>({
+        queryKey: ['marketplace-team-tags'],
+        queryFn: fetchMarketplaceTeamTags,
+        staleTime: STALE_TIME,
+    })
+    return { tags: data, isLoading }
+}
+
 // ─── Publishing ─────────────────────────────────────────────────────────────
 
 /** Submit an agent for marketplace review */
@@ -46,6 +70,17 @@ export function useSubmitAgent() {
     })
 }
 
+/** Submit a team for marketplace review */
+export function useSubmitTeam() {
+    const queryClient = useQueryClient()
+    return useMutation<MarketplaceSubmission, Error, { teamId: string; tags: string[]; readme?: string; userId: string }>({
+        mutationFn: ({ teamId, tags, readme, userId }) => submitTeamForReview(teamId, tags, userId, readme),
+        onSuccess: () => {
+            void queryClient.invalidateQueries({ queryKey: ['my-submissions'] })
+        },
+    })
+}
+
 /** Fetch current user's submissions */
 export function useMySubmissions(userId: string | null) {
     return useQuery<MarketplaceSubmission[]>({
@@ -79,6 +114,7 @@ export function useApproveSubmission() {
         onSuccess: () => {
             void queryClient.invalidateQueries({ queryKey: ['pending-submissions'] })
             void queryClient.invalidateQueries({ queryKey: ['marketplace-agents'] })
+            void queryClient.invalidateQueries({ queryKey: ['marketplace-teams'] })
         },
     })
 }
@@ -137,3 +173,45 @@ export function useSubmitRating() {
         },
     })
 }
+
+/** Fetch reviews for a specific team */
+export function useTeamReviews(teamId: string | null) {
+    return useQuery<TeamReview[]>({
+        queryKey: ['team-reviews', teamId],
+        queryFn: () => {
+            if (!teamId) throw new Error('Missing teamId')
+            return fetchTeamReviews(teamId)
+        },
+        enabled: !!teamId,
+        staleTime: 60 * 1000,
+    })
+}
+
+/** Submit or update a rating for a marketplace team */
+export function useSubmitTeamRating() {
+    const queryClient = useQueryClient()
+    return useMutation<TeamReview, Error, { teamId: string; userId: string; workspaceId: string; rating: number; reviewText?: string }>({
+        mutationFn: ({ teamId, userId, workspaceId, rating, reviewText }) =>
+            submitTeamRating(teamId, userId, workspaceId, rating, reviewText ?? ''),
+        onSuccess: (_data, vars) => {
+            void queryClient.invalidateQueries({ queryKey: ['team-reviews', vars.teamId] })
+            void queryClient.invalidateQueries({ queryKey: ['marketplace-teams'] })
+        },
+    })
+}
+
+// ─── Team Install ───────────────────────────────────────────────────────────
+
+/** Install a marketplace team into the user's workspace */
+export function useInstallTeam() {
+    const queryClient = useQueryClient()
+    return useMutation<TeamInstallResult, Error, { teamId: string; workspaceId: string; userId: string }>({
+        mutationFn: ({ teamId, workspaceId, userId }) =>
+            installMarketplaceTeam(teamId, workspaceId, userId),
+        onSuccess: () => {
+            void queryClient.invalidateQueries({ queryKey: ['teams'] })
+            void queryClient.invalidateQueries({ queryKey: ['agents'] })
+            void queryClient.invalidateQueries({ queryKey: ['marketplace-teams'] })
+        },
+    })
+}
diff --git a/src/pages/Marketplace.tsx b/src/pages/Marketplace.tsx
index 4ec866e..62abeba 100644
--- a/src/pages/Marketplace.tsx
+++ b/src/pages/Marketplace.tsx
@@ -2,21 +2,25 @@
 // Copyright (C) 2026 CrewForm
 
 import { useState, useDeferredValue } from 'react'
-import { Store, Loader2, CheckCircle2, XCircle, Upload, BarChart3 } from 'lucide-react'
+import { Store, Loader2, CheckCircle2, XCircle, Upload, BarChart3, Bot, Users2 } from 'lucide-react'
 import { useWorkspace } from '@/hooks/useWorkspace'
 import { useAuth } from '@/hooks/useAuth'
-import { useMarketplaceAgents, useMarketplaceTags, useMySubmissions } from '@/hooks/useMarketplace'
+import { useMarketplaceAgents, useMarketplaceTags, useMySubmissions, useMarketplaceTeams, useMarketplaceTeamTags } from '@/hooks/useMarketplace'
 import { useInstallAgent } from '@/hooks/useInstallAgent'
+import { useInstallTeam } from '@/hooks/useMarketplace'
 import { MarketplaceFilters } from '@/components/marketplace/MarketplaceFilters'
 import { AgentCard } from '@/components/marketplace/AgentCard'
 import { AgentDetailModal } from '@/components/marketplace/AgentDetailModal'
+import { TeamCard } from '@/components/marketplace/TeamCard'
+import { TeamDetailModal } from '@/components/marketplace/TeamDetailModal'
 import { CreatorDashboard } from '@/components/marketplace/CreatorDashboard'
 import { ErrorState } from '@/components/shared/ErrorState'
 import type { MarketplaceSortOption } from '@/db/marketplace'
-import type { Agent } from '@/types'
+import type { Agent, Team } from '@/types'
 import { cn } from '@/lib/utils'
 
 type MarketplaceTab = 'browse' | 'submissions' | 'creator'
+type BrowseType = 'agents' | 'teams'
 
 const STATUS_COLORS: Record<string, string> = {
   pending: 'text-amber-400 bg-amber-500/10',
@@ -26,6 +30,7 @@ const STATUS_COLORS: Record<string, string> = {
 
 export function Marketplace() {
   const [activeTab, setActiveTab] = useState<MarketplaceTab>('browse')
+  const [browseType, setBrowseType] = useState<BrowseType>('agents')
 
   // ─── Filter state ────────────────────────────────────────────────────────
   const [search, setSearch] = useState('')
@@ -33,6 +38,7 @@ export function Marketplace() {
   const [sort, setSort] = useState<MarketplaceSortOption>('installs')
   const [category, setCategory] = useState<string | null>(null)
   const [selectedAgent, setSelectedAgent] = useState<Agent | null>(null)
+  const [selectedTeam, setSelectedTeam] = useState<Team | null>(null)
   const [toast, setToast] = useState<{ type: 'success' | 'error'; message: string } | null>(null)
 
   const deferredSearch = useDeferredValue(search)
@@ -40,14 +46,25 @@ export function Marketplace() {
   // ─── Data ────────────────────────────────────────────────────────────────
   const { workspaceId } = useWorkspace()
   const { user } = useAuth()
-  const { agents, isLoading, error, refetch } = useMarketplaceAgents({
+
+  const queryOptions = {
     search: deferredSearch,
     tags: selectedTags.length > 0 ? selectedTags : undefined,
     category: category ?? undefined,
     sort,
-  })
-  const { tags: availableTags } = useMarketplaceTags()
-  const installMutation = useInstallAgent()
+  }
+
+  const { agents, isLoading: agentsLoading, error: agentsError, refetch: refetchAgents } = useMarketplaceAgents(queryOptions)
+  const { teams, isLoading: teamsLoading, error: teamsError, refetch: refetchTeams } = useMarketplaceTeams(queryOptions)
+  const { tags: agentTags } = useMarketplaceTags()
+  const { tags: teamTags } = useMarketplaceTeamTags()
+
+  const availableTags = browseType === 'agents' ? agentTags : teamTags
+  const isLoading = browseType === 'agents' ? agentsLoading : teamsLoading
+  const error = browseType === 'agents' ? agentsError : teamsError
+
+  const installAgentMutation = useInstallAgent()
+  const installTeamMutation = useInstallTeam()
   const { data: mySubmissions = [] } = useMySubmissions(user?.id ?? null)
 
   // ─── Handlers ────────────────────────────────────────────────────────────
@@ -57,10 +74,16 @@ export function Marketplace() {
     )
   }
 
-  const handleInstall = (agent: Agent) => {
+  const handleBrowseTypeChange = (type: BrowseType) => {
+    setBrowseType(type)
+    setSelectedTags([])
+    setCategory(null)
+  }
+
+  const handleInstallAgent = (agent: Agent) => {
     if (!workspaceId || !user) return
 
-    installMutation.mutate(
+    installAgentMutation.mutate(
       { agentId: agent.id, workspaceId, userId: user.id },
       {
         onSuccess: (result) => {
@@ -76,6 +99,25 @@ export function Marketplace() {
     )
   }
 
+  const handleInstallTeam = (team: Team) => {
+    if (!workspaceId || !user) return
+
+    installTeamMutation.mutate(
+      { teamId: team.id, workspaceId, userId: user.id },
+      {
+        onSuccess: () => {
+          setToast({ type: 'success', message: `"${team.name}" team installed to your workspace!` })
+          setSelectedTeam(null)
+          setTimeout(() => setToast(null), 4000)
+        },
+        onError: (err) => {
+          setToast({ type: 'error', message: err.message })
+          setTimeout(() => setToast(null), 4000)
+        },
+      },
+    )
+  }
+
   return (
     <div className="p-6 lg:p-8">
       {/* Header */}
@@ -85,7 +127,7 @@ export function Marketplace() {
           <h1 className="text-2xl font-semibold text-gray-100">Marketplace</h1>
         </div>
         <p className="text-sm text-gray-500">
-          Browse, install, and publish agents with the CrewForm community.
+          Browse, install, and publish agents and teams with the CrewForm community.
         </p>
       </div>
 
@@ -116,6 +158,36 @@ export function Marketplace() {
       {/* Tab content */}
       {activeTab === 'browse' && (
         <>
+          {/* Agents / Teams toggle */}
+          <div className="mb-4 flex items-center gap-1 rounded-lg border border-border bg-surface-card p-1 w-fit">
+            <button
+              type="button"
+              onClick={() => handleBrowseTypeChange('agents')}
+              className={cn(
+                'flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+                browseType === 'agents'
+                  ? 'bg-brand-primary/10 text-brand-primary'
+                  : 'text-gray-500 hover:text-gray-300',
+              )}
+            >
+              <Bot className="h-3.5 w-3.5" />
+              Agents
+            </button>
+            <button
+              type="button"
+              onClick={() => handleBrowseTypeChange('teams')}
+              className={cn(
+                'flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors',
+                browseType === 'teams'
+                  ? 'bg-brand-primary/10 text-brand-primary'
+                  : 'text-gray-500 hover:text-gray-300',
+              )}
+            >
+              <Users2 className="h-3.5 w-3.5" />
+              Teams
+            </button>
+          </div>
+
           {/* Filters */}
           <div className="mb-6">
             <MarketplaceFilters
@@ -131,41 +203,54 @@ export function Marketplace() {
             />
           </div>
 
-          {/* Agent Grid */}
+          {/* Grid */}
           {error ? (
             <ErrorState
               message={error instanceof Error ? error.message : 'Failed to load marketplace'}
-              onRetry={() => void refetch()}
+              onRetry={() => browseType === 'agents' ? void refetchAgents() : void refetchTeams()}
             />
           ) : isLoading ? (
             <div className="flex items-center justify-center py-20">
               <Loader2 className="h-8 w-8 animate-spin text-brand-primary" />
             </div>
-          ) : agents.length === 0 ? (
-            <div className="flex flex-col items-center justify-center rounded-lg border border-border bg-surface-card py-16">
-              <Store className="mb-4 h-12 w-12 text-gray-600" />
-              <h2 className="mb-2 text-lg font-medium text-gray-300">
-                No agents found
-              </h2>
-              <p className="text-sm text-gray-500">
-                Try adjusting your search or filters.
-              </p>
-            </div>
+          ) : browseType === 'agents' ? (
+            agents.length === 0 ? (
+              <div className="flex flex-col items-center justify-center rounded-lg border border-border bg-surface-card py-16">
+                <Store className="mb-4 h-12 w-12 text-gray-600" />
+                <h2 className="mb-2 text-lg font-medium text-gray-300">No agents found</h2>
+                <p className="text-sm text-gray-500">Try adjusting your search or filters.</p>
+              </div>
+            ) : (
+              <>
+                <p className="mb-4 text-xs text-gray-500">
+                  {agents.length} agent{agents.length !== 1 ? 's' : ''} found
+                </p>
+                <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+                  {agents.map((agent) => (
+                    <AgentCard key={agent.id} agent={agent} onClick={setSelectedAgent} />
+                  ))}
+                </div>
+              </>
+            )
           ) : (
-            <>
-              <p className="mb-4 text-xs text-gray-500">
-                {agents.length} agent{agents.length !== 1 ? 's' : ''} found
-              </p>
-              <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-                {agents.map((agent) => (
-                  <AgentCard
-                    key={agent.id}
-                    agent={agent}
-                    onClick={setSelectedAgent}
-                  />
-                ))}
+            teams.length === 0 ? (
+              <div className="flex flex-col items-center justify-center rounded-lg border border-border bg-surface-card py-16">
+                <Users2 className="mb-4 h-12 w-12 text-gray-600" />
+                <h2 className="mb-2 text-lg font-medium text-gray-300">No teams found</h2>
+                <p className="text-sm text-gray-500">Try adjusting your search or filters.</p>
               </div>
-            </>
+            ) : (
+              <>
+                <p className="mb-4 text-xs text-gray-500">
+                  {teams.length} team{teams.length !== 1 ? 's' : ''} found
+                </p>
+                <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
+                  {teams.map((team) => (
+                    <TeamCard key={team.id} team={team} onClick={setSelectedTeam} />
+                  ))}
+                </div>
+              </>
+            )
           )}
         </>
       )}
@@ -177,7 +262,7 @@ export function Marketplace() {
               <Upload className="mx-auto mb-2 h-10 w-10 text-gray-600" />
               <h3 className="mb-1 text-lg font-medium text-gray-300">No submissions yet</h3>
               <p className="text-sm text-gray-500">
-                Publish an agent from its detail page to get started.
+                Publish an agent or team from its detail page to get started.
               </p>
             </div>
           ) : (
@@ -186,7 +271,7 @@ export function Marketplace() {
                 <div key={sub.id} className="flex items-center gap-3 px-4 py-3">
                   <div className="min-w-0 flex-1">
                     <p className="text-sm font-medium text-gray-200">
-                      {sub.agent_name ?? 'Unknown Agent'}
+                      {sub.agent_name ?? 'Unknown'}
                     </p>
                     <p className="text-xs text-gray-500">
                       Submitted {new Date(sub.created_at).toLocaleDateString()}
@@ -210,12 +295,19 @@ export function Marketplace() {
 
       {activeTab === 'creator' && <CreatorDashboard />}
 
-      {/* Detail Modal */}
+      {/* Detail Modals */}
       <AgentDetailModal
         agent={selectedAgent}
         onClose={() => setSelectedAgent(null)}
-        onInstall={handleInstall}
-        isInstalling={installMutation.isPending}
+        onInstall={handleInstallAgent}
+        isInstalling={installAgentMutation.isPending}
+      />
+
+      <TeamDetailModal
+        team={selectedTeam}
+        onClose={() => setSelectedTeam(null)}
+        onInstall={handleInstallTeam}
+        isInstalling={installTeamMutation.isPending}
       />
 
       {/* Toast notification */}
diff --git a/src/pages/TeamDetail.tsx b/src/pages/TeamDetail.tsx
index c524688..8d70052 100644
--- a/src/pages/TeamDetail.tsx
+++ b/src/pages/TeamDetail.tsx
@@ -17,6 +17,7 @@ import {
     LayoutList,
     Workflow,
     Download,
+    Upload,
 } from 'lucide-react'
 import { useTeam } from '@/hooks/useTeam'
 import { useAgents } from '@/hooks/useAgents'
@@ -36,6 +37,7 @@ import { TeamMemoryPanel } from '@/components/teams/TeamMemoryPanel'
 import { ChannelSelector } from '@/components/shared/ChannelSelector'
 import { EEGate } from '@/components/shared/UpgradeBadge'
 import { UpgradeCard } from '@/components/shared/UpgradeBadge'
+import { PublishTeamModal } from '@/components/marketplace/PublishTeamModal'
 import { Skeleton } from '@/components/ui/skeleton'
 import { cn } from '@/lib/utils'
 import { exportTeam, downloadExport } from '@/lib/exportImport'
@@ -80,6 +82,7 @@ export function TeamDetail() {
     const [outputRouteIds, setOutputRouteIds] = useState<string[] | null>(null)
     const [channelInitialized, setChannelInitialized] = useState(false)
     const [view, setView] = useState<'form' | 'canvas'>('form')
+    const [showPublishModal, setShowPublishModal] = useState(false)
 
     const { runs, isLoading: isLoadingRuns } = useTeamRuns(id ?? null)
     const pipelineConfig = team?.mode === 'pipeline' ? (team.config as PipelineConfig) : undefined
@@ -316,6 +319,17 @@ export function TeamDetail() {
                                     Export
                                 </button>
 
+                                {/* Publish to Marketplace */}
+                                <button
+                                    type="button"
+                                    onClick={() => setShowPublishModal(true)}
+                                    className="flex items-center gap-2 rounded-lg border border-brand-primary/30 px-4 py-2 text-sm font-medium text-brand-primary transition-colors hover:bg-brand-primary/10"
+                                    title="Publish this team to the marketplace"
+                                >
+                                    <Upload className="h-4 w-4" />
+                                    Publish
+                                </button>
+
                                 {/* Delete button */}
                                 <div className="relative">
                                     {showDeleteConfirm ? (
@@ -581,6 +595,14 @@ export function TeamDetail() {
                             onCreated={(runId) => navigate(`/teams/${team.id}/runs/${runId}`)}
                         />
                     )}
+
+                    {/* Publish Team Modal */}
+                    {showPublishModal && (
+                        <PublishTeamModal
+                            team={team}
+                            onClose={() => setShowPublishModal(false)}
+                        />
+                    )}
                 </>
             )}
         </div>
diff --git a/src/types/index.ts b/src/types/index.ts
index ea667b5..bf6863e 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -134,6 +134,12 @@ export interface Team {
   mode: TeamMode
   config: PipelineConfig | OrchestratorConfig | CollaborationConfig
   output_route_ids: string[] | null // null = all routes, [] = none, [...ids] = specific
+  // Marketplace fields
+  is_published: boolean
+  marketplace_tags: string[]
+  install_count: number
+  rating_avg: number
+  marketplace_readme: string | null
   created_at: string
   updated_at: string
 }
diff --git a/supabase/migrations/074_team_marketplace.sql b/supabase/migrations/074_team_marketplace.sql
new file mode 100644
index 0000000..3b688aa
--- /dev/null
+++ b/supabase/migrations/074_team_marketplace.sql
@@ -0,0 +1,158 @@
+-- 074_team_marketplace.sql
+-- Add marketplace support for teams: publish, install, review
+
+-- ────────────────────────────────────────────────────────────────────────────
+-- 1. Add marketplace columns to teams (mirrors agents)
+-- ────────────────────────────────────────────────────────────────────────────
+
+ALTER TABLE public.teams
+  ADD COLUMN IF NOT EXISTS is_published       BOOLEAN NOT NULL DEFAULT false,
+  ADD COLUMN IF NOT EXISTS marketplace_tags   TEXT[]  NOT NULL DEFAULT '{}',
+  ADD COLUMN IF NOT EXISTS install_count      INTEGER NOT NULL DEFAULT 0,
+  ADD COLUMN IF NOT EXISTS rating_avg         NUMERIC(2,1) NOT NULL DEFAULT 0,
+  ADD COLUMN IF NOT EXISTS marketplace_readme TEXT;
+
+CREATE INDEX IF NOT EXISTS idx_teams_published
+  ON public.teams(is_published) WHERE is_published = true;
+
+CREATE INDEX IF NOT EXISTS idx_teams_marketplace_tags
+  ON public.teams USING GIN(marketplace_tags);
+
+-- ────────────────────────────────────────────────────────────────────────────
+-- 2. Update marketplace_submissions to support teams
+-- ────────────────────────────────────────────────────────────────────────────
+
+-- Make agent_id nullable (submissions can now be for teams)
+ALTER TABLE public.marketplace_submissions
+  ALTER COLUMN agent_id DROP NOT NULL;
+
+-- Add team_id column
+ALTER TABLE public.marketplace_submissions
+  ADD COLUMN IF NOT EXISTS team_id UUID REFERENCES public.teams(id) ON DELETE CASCADE;
+
+CREATE INDEX IF NOT EXISTS idx_marketplace_submissions_team
+  ON public.marketplace_submissions(team_id);
+
+-- Ensure each submission references either an agent or a team (not both, not neither)
+ALTER TABLE public.marketplace_submissions
+  ADD CONSTRAINT chk_submission_target
+  CHECK (
+    (agent_id IS NOT NULL AND team_id IS NULL) OR
+    (agent_id IS NULL AND team_id IS NOT NULL)
+  );
+
+-- ────────────────────────────────────────────────────────────────────────────
+-- 3. team_installs — tracks who installed which marketplace team
+-- ────────────────────────────────────────────────────────────────────────────
+
+CREATE TABLE public.team_installs (
+  id                  UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  team_id             UUID NOT NULL REFERENCES public.teams(id) ON DELETE CASCADE,
+  workspace_id        UUID NOT NULL REFERENCES public.workspaces(id) ON DELETE CASCADE,
+  installed_by        UUID REFERENCES auth.users(id) ON DELETE SET NULL,
+  source_workspace_id UUID REFERENCES public.workspaces(id) ON DELETE SET NULL,
+  cloned_team_id      UUID REFERENCES public.teams(id) ON DELETE SET NULL,
+  installed_at        TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE INDEX idx_team_installs_team      ON public.team_installs(team_id);
+CREATE INDEX idx_team_installs_workspace ON public.team_installs(workspace_id);
+
+ALTER TABLE public.team_installs ENABLE ROW LEVEL SECURITY;
+
+CREATE POLICY "team_installs_select" ON public.team_installs
+  FOR SELECT USING (
+    workspace_id IN (SELECT workspace_id FROM public.workspace_members WHERE user_id = auth.uid())
+  );
+
+CREATE POLICY "team_installs_insert" ON public.team_installs
+  FOR INSERT WITH CHECK (
+    workspace_id IN (SELECT workspace_id FROM public.workspace_members WHERE user_id = auth.uid())
+  );
+
+-- ────────────────────────────────────────────────────────────────────────────
+-- 4. team_reviews — marketplace reviews with 1–5 rating
+-- ────────────────────────────────────────────────────────────────────────────
+
+CREATE TABLE public.team_reviews (
+  id           UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  team_id      UUID NOT NULL REFERENCES public.teams(id) ON DELETE CASCADE,
+  workspace_id UUID NOT NULL REFERENCES public.workspaces(id) ON DELETE CASCADE,
+  user_id      UUID NOT NULL REFERENCES auth.users(id) ON DELETE CASCADE,
+  rating       INTEGER NOT NULL CHECK (rating >= 1 AND rating <= 5),
+  review_text  TEXT NOT NULL DEFAULT '',
+  created_at   TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+  updated_at   TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+
+  -- One review per user per team
+  UNIQUE (team_id, user_id)
+);
+
+CREATE INDEX idx_team_reviews_team ON public.team_reviews(team_id);
+
+CREATE TRIGGER trg_team_reviews_updated_at
+  BEFORE UPDATE ON public.team_reviews
+  FOR EACH ROW EXECUTE FUNCTION public.update_updated_at();
+
+ALTER TABLE public.team_reviews ENABLE ROW LEVEL SECURITY;
+
+CREATE POLICY "team_reviews_select" ON public.team_reviews
+  FOR SELECT USING (true);
+
+CREATE POLICY "team_reviews_insert" ON public.team_reviews
+  FOR INSERT WITH CHECK (user_id = auth.uid());
+
+CREATE POLICY "team_reviews_update" ON public.team_reviews
+  FOR UPDATE USING (user_id = auth.uid());
+
+CREATE POLICY "team_reviews_delete" ON public.team_reviews
+  FOR DELETE USING (user_id = auth.uid());
+
+-- ────────────────────────────────────────────────────────────────────────────
+-- 5. Trigger: auto-update teams.rating_avg on review changes
+-- ────────────────────────────────────────────────────────────────────────────
+
+CREATE OR REPLACE FUNCTION public.update_team_rating()
+RETURNS TRIGGER AS $$
+DECLARE
+  target_team_id UUID;
+  avg_rating NUMERIC(2,1);
+BEGIN
+  IF TG_OP = 'DELETE' THEN
+    target_team_id := OLD.team_id;
+  ELSE
+    target_team_id := NEW.team_id;
+  END IF;
+
+  SELECT COALESCE(ROUND(AVG(rating)::NUMERIC, 1), 0)
+  INTO avg_rating
+  FROM public.team_reviews
+  WHERE team_id = target_team_id;
+
+  UPDATE public.teams
+  SET rating_avg = avg_rating
+  WHERE id = target_team_id;
+
+  IF TG_OP = 'DELETE' THEN
+    RETURN OLD;
+  END IF;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql SECURITY DEFINER;
+
+CREATE TRIGGER trg_team_reviews_rating
+  AFTER INSERT OR UPDATE OR DELETE ON public.team_reviews
+  FOR EACH ROW EXECUTE FUNCTION public.update_team_rating();
+
+-- ────────────────────────────────────────────────────────────────────────────
+-- 6. RPC: increment_team_install_count (used by installTeam)
+-- ────────────────────────────────────────────────────────────────────────────
+
+CREATE OR REPLACE FUNCTION public.increment_team_install_count(team_row_id UUID)
+RETURNS VOID AS $$
+BEGIN
+  UPDATE public.teams
+  SET install_count = install_count + 1
+  WHERE id = team_row_id;
+END;
+$$ LANGUAGE plpgsql SECURITY DEFINER;