diff --git a/site/src/app/(v2)/(marketing)/(index)/sections/TechSection.tsx b/site/src/app/(v2)/(marketing)/(index)/sections/TechSection.tsx
index 3dabd84f9e..c439d97d3d 100644
--- a/site/src/app/(v2)/(marketing)/(index)/sections/TechSection.tsx
+++ b/site/src/app/(v2)/(marketing)/(index)/sections/TechSection.tsx
@@ -6,7 +6,6 @@ import rivetWhiteLogo from "../images/platforms/rivet-white.svg";
 import cloudflareWorkersLogo from "../images/platforms/cloudflare-workers.svg";
 import bunLogo from "../images/platforms/bun.svg";
 import nodejsLogo from "../images/platforms/nodejs.svg";
-import redisLogo from "../images/platforms/redis.svg";
 import fileSystemLogo from "../images/platforms/file-system.svg";
 import memoryLogo from "../images/platforms/memory.svg";
 import vercelLogo from "../images/platforms/vercel.svg";
@@ -248,12 +247,6 @@ export function TechSection() {
 						</TechSubSection>
 
 						<TechSubSection title="Storage">
-							<TechLink
-								href="/docs/actors/quickstart/backend"
-								name="Redis"
-								icon={redisLogo}
-								alt="Redis"
-							/>
 							<TechLink
 								href="/docs/actors/"
 								name="Postgres"
diff --git a/site/src/app/(v2)/(marketing)/cloud/ArchitectureSection.tsx b/site/src/app/(v2)/(marketing)/cloud/ArchitectureSection.tsx
new file mode 100644
index 0000000000..f4ca9811ed
--- /dev/null
+++ b/site/src/app/(v2)/(marketing)/cloud/ArchitectureSection.tsx
@@ -0,0 +1,108 @@
+"use client";
+
+import {
+	Icon,
+	faArrowRight,
+	faCloud,
+	faDatabase,
+	faServer,
+	faLayerGroup,
+} from "@rivet-gg/icons";
+import Link from "next/link";
+
+export const ArchitectureSection = () => {
+	return (
+		<div className="mx-auto max-w-7xl px-6 py-32 lg:py-40">
+			<div className="text-center mb-16">
+				<h2 className="text-4xl font-medium tracking-tight text-white">
+					Connect to Your Applications
+				</h2>
+				<p className="mt-4 text-lg text-white/70">
+					Rivet Cloud scales actors that connect seamlessly to your applications deployed anywhere
+				</p>
+			</div>
+
+			{/* Architecture Diagram */}
+			<div className="bg-[#0A0A0A] rounded-xl p-8 mb-16">
+				<div className="grid grid-cols-1 lg:grid-cols-[1fr_auto_1fr] gap-8 items-center">
+					{/* Your Applications */}
+					<div className="text-center">
+						<div className="bg-white/5 rounded-lg p-6 border border-white/10">
+							<Icon icon={faServer} className="text-3xl text-white/90 mb-4" />
+							<h3 className="text-xl font-medium text-white mb-2">Your Applications</h3>
+							<p className="text-white/60 text-sm">
+								Deploy on Railway, Vercel, AWS, GCP, or any platform
+							</p>
+						</div>
+					</div>
+
+					{/* Connection Arrows */}
+					<div className="flex flex-row lg:flex-col items-center justify-center gap-4">
+						<Icon icon={faArrowRight} className="text-xl text-white/40 rotate-90 lg:rotate-0" />
+						<Icon icon={faArrowRight} className="text-xl text-white/40 -rotate-90 lg:rotate-180" />
+					</div>
+
+					{/* Rivet Engine */}
+					<div className="text-center">
+						<div className="bg-white/5 rounded-lg p-6 border border-white/10">
+							<Icon icon={faLayerGroup} className="text-3xl text-white/90 mb-4" />
+							<h3 className="text-xl font-medium text-white mb-2">Rivet Cloud</h3>
+							<p className="text-white/60 text-sm">
+								Actor scaling and storage with managed FoundationDB
+							</p>
+						</div>
+					</div>
+				</div>
+
+			</div>
+
+			{/* Platform Integration Details */}
+			<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+				<div className="bg-white/2 rounded-lg p-6 border border-white/10">
+					<div className="flex items-center gap-3 mb-4">
+						<div className="w-8 h-8 bg-orange-500/20 rounded-lg flex items-center justify-center">
+							<span className="text-orange-500 font-bold text-sm">R</span>
+						</div>
+						<h3 className="text-lg font-medium text-white">Railway</h3>
+					</div>
+					<p className="text-white/60 text-sm">
+						Connect your Railway-deployed applications to Rivet actors for stateful, real-time functionality.
+					</p>
+				</div>
+
+				<div className="bg-white/2 rounded-lg p-6 border border-white/10">
+					<div className="flex items-center gap-3 mb-4">
+						<div className="w-8 h-8 bg-black/20 rounded-lg flex items-center justify-center">
+							<span className="text-black font-bold text-sm">V</span>
+						</div>
+						<h3 className="text-lg font-medium text-white">Vercel</h3>
+					</div>
+					<p className="text-white/60 text-sm">
+						Integrate Vercel serverless functions with Rivet actors for persistent state and real-time features.
+					</p>
+				</div>
+
+				<div className="bg-white/2 rounded-lg p-6 border border-white/10">
+					<div className="flex items-center gap-3 mb-4">
+						<Icon icon={faCloud} className="text-xl text-white/90" />
+						<h3 className="text-lg font-medium text-white">Any Platform</h3>
+					</div>
+					<p className="text-white/60 text-sm">
+						Connect applications from AWS, GCP, Azure, or any cloud platform to Rivet Cloud
+					</p>
+				</div>
+			</div>
+
+			{/* CTA */}
+			<div className="text-center mt-12">
+				<Link
+					href="/docs/self-hosting/connect-backend"
+					className="inline-flex items-center gap-2 text-white/70 hover:text-white transition-colors"
+				>
+					<span>Learn how to connect your backend</span>
+					<Icon icon={faArrowRight} />
+				</Link>
+			</div>
+		</div>
+	);
+};
diff --git a/site/src/app/(v2)/(marketing)/cloud/CommandCenterSection.tsx b/site/src/app/(v2)/(marketing)/cloud/CommandCenterSection.tsx
index 988451530b..e2f977e57d 100644
--- a/site/src/app/(v2)/(marketing)/cloud/CommandCenterSection.tsx
+++ b/site/src/app/(v2)/(marketing)/cloud/CommandCenterSection.tsx
@@ -100,11 +100,10 @@ export const CommandCenterSection = () => {
 					{/* Header */}
 					<div className="max-w-7xl mx-auto relative z-10">
 						<h2 className="max-w-lg text-4xl font-medium tracking-tight text-white">
-							The command center your backend is missing
+							Meet your command center
 						</h2>
 						<p className="max-w-lg mt-4 text-lg text-white/70">
-							Complete visibility and control over your serverless
-							infrastructure
+							Complete visibility and control over your Rivet Actors
 						</p>
 					</div>
 
diff --git a/site/src/app/(v2)/(marketing)/cloud/CtaSection.tsx b/site/src/app/(v2)/(marketing)/cloud/CtaSection.tsx
index 03e759d63f..2b8860d4ff 100644
--- a/site/src/app/(v2)/(marketing)/cloud/CtaSection.tsx
+++ b/site/src/app/(v2)/(marketing)/cloud/CtaSection.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { CtaButtons } from "./CtaButtons";
+import { Icon, faArrowRight } from "@rivet-gg/icons";
+import { MarketingButton } from "./MarketingButton";
 
 // CTA section
 export const CtaSection = () => {
@@ -16,7 +17,18 @@ export const CtaSection = () => {
 				</p>
 
 				<div className="mt-12 flex items-center justify-center gap-x-6">
-					<CtaButtons />
+					<div className="flex flex-col sm:flex-row items-center sm:items-start gap-4">
+						<MarketingButton href="/talk-to-an-engineer" primary>
+							Get Started
+						</MarketingButton>
+						<MarketingButton href="/docs/cloud">
+							<span>Documentation</span>
+							<Icon
+								icon={faArrowRight}
+								className="ml-2 text-xs group-hover:translate-x-0.5 transition-transform duration-200"
+							/>
+						</MarketingButton>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/site/src/app/(v2)/(marketing)/cloud/FeaturesGrid.tsx b/site/src/app/(v2)/(marketing)/cloud/FeaturesGrid.tsx
index 9c0de0c63b..a727dd3d9b 100644
--- a/site/src/app/(v2)/(marketing)/cloud/FeaturesGrid.tsx
+++ b/site/src/app/(v2)/(marketing)/cloud/FeaturesGrid.tsx
@@ -180,24 +180,24 @@ export const FeaturesGrid = () => {
 	const features = [
 		{
 			//title: "Stateless Functions",
-			title: "Functions",
+			title: "Rivet Engine",
 			description: (
 				<>
-					Deploy <WT>serverless functions</WT> that scale
-					automatically.
+					<WT>Enterprise-scale orchestration</WT> built on FoundationDB for massive actor distribution and fault tolerance.
 				</>
 			),
-			faIcon: faCode,
-			href: "/docs/cloud/functions",
-			useCases: ["APIs", "edge computing"],
+			faIcon: faServer,
+			href: "/docs/self-hosting",
+			useCases: ["actor orchestration", "multi-region", "fault tolerance"],
+			badge: "FoundationDB",
 		},
 		{
 			//title: "Stateful Actors",
-			title: "Actors",
+			title: "Rivet Actors",
 			description: (
 				<>
 					<WT>Long running tasks</WT> with state persistence,
-					hibernation, and realtime.
+					hibernation, and realtime that scale infinitely.
 				</>
 			),
 			faIcon: faActorsBorderless,
@@ -207,16 +207,15 @@ export const FeaturesGrid = () => {
 		},
 		{
 			//title: "Sandboxed Containers",
-			title: "Containers",
+			title: "Platform Integration",
 			description: (
 				<>
-					<WT>Run CPU- & memory-intensive workloads</WT> in secure
-					containers with fast coldstarts and blitz scaling.
+					<WT>Connect to your applications</WT> on Railway, Vercel, and other platforms with seamless integration.
 				</>
 			),
-			faIcon: faServer,
-			href: "/docs/cloud/containers",
-			useCases: ["batch jobs", "code sandbox", "game servers"],
+			faIcon: faLayerGroup,
+			href: "/docs/self-hosting/connect-backend",
+			useCases: ["Railway", "Vercel", "any platform"],
 		},
 		//{
 		//	title: "Workflows",
@@ -249,21 +248,6 @@ export const FeaturesGrid = () => {
 					/>
 				))}
 			</div>
-			<div className="text-center mt-16">
-				<p className="text-white/70 text-lg">
-					<span className="font-normal text-white">
-						Select the tools that fit your needs
-					</span>{" "}
-					— integrated together into a single platform.
-				</p>
-				<Link
-					href="/pricing"
-					className="inline-flex items-center gap-2 mt-4 text-white/70 hover:text-white transition-colors"
-				>
-					<span>See pricing</span>
-					<Icon icon={faArrowRight} />
-				</Link>
-			</div>
 		</div>
 	);
 };
diff --git a/site/src/app/(v2)/(marketing)/cloud/PowerfulPrimitivesSection.tsx b/site/src/app/(v2)/(marketing)/cloud/PowerfulPrimitivesSection.tsx
index cf4140ff4d..69f794a935 100644
--- a/site/src/app/(v2)/(marketing)/cloud/PowerfulPrimitivesSection.tsx
+++ b/site/src/app/(v2)/(marketing)/cloud/PowerfulPrimitivesSection.tsx
@@ -65,6 +65,51 @@ interface TabGroup {
 
 // Define all tab groups and their items at the top level
 const TAB_GROUPS: TabGroup[] = [
+	{
+		id: "scaling",
+		title: "Scaling",
+		items: [
+			{
+				id: "foundationdb",
+				icon: faDatabase,
+				title: "FoundationDB Backend",
+				description:
+					"Enterprise-grade distributed database that provides ACID transactions and infinite scalability for actor state management.",
+				image: imgPerTenantDatabase, // Reuse existing image
+				docs: {
+					actors: true,
+					containers: false,
+					functions: false,
+				},
+			},
+			{
+				id: "multi-region",
+				icon: faServer,
+				title: "Multi-Region Deployment",
+				description:
+					"Deploy actors across multiple geographic regions with automatic failover and data replication.",
+				image: imgLocalFirstSync, // Reuse existing image
+				docs: {
+					actors: true,
+					containers: false,
+					functions: false,
+				},
+			},
+			{
+				id: "fault-tolerance",
+				icon: faCogs,
+				title: "Fault Tolerance",
+				description:
+					"Built-in error handling and recovery with automatic actor restart and state preservation.",
+				image: imgManagedCi, // Reuse existing image
+				docs: {
+					actors: true,
+					containers: false,
+					functions: false,
+				},
+			},
+		],
+	},
 	{
 		id: "ai",
 		title: "AI",
diff --git a/site/src/app/(v2)/(marketing)/cloud/RivetCloudSection.tsx b/site/src/app/(v2)/(marketing)/cloud/RivetCloudSection.tsx
index 31e64ebdd3..c457610ccd 100644
--- a/site/src/app/(v2)/(marketing)/cloud/RivetCloudSection.tsx
+++ b/site/src/app/(v2)/(marketing)/cloud/RivetCloudSection.tsx
@@ -24,7 +24,7 @@ export const RivetCloudSection = () => {
 			icon: faCloud,
 			title: "Rivet Cloud",
 			description:
-				"Fully-managed serverless platform with enterprise support. Let us handle the infrastructure while you focus on your code.",
+				"Enterprise-scale actor orchestration built on FoundationDB. Connect your applications on Railway, Vercel, and other platforms with infinite scaling.",
 			buttonText: "See Pricing",
 			buttonHref: "/pricing",
 		},
@@ -32,7 +32,7 @@ export const RivetCloudSection = () => {
 			icon: faServer,
 			title: "Bring Your Own Cloud",
 			description:
-				"Specify your cloud of choice or provide your own API keys to deploy Rivet within your own cloud. Maintain control of where your where your backend runs while Rivet handles the maintenance.",
+				"Deploy the Rivet Engine on your preferred cloud infrastructure with FoundationDB backend. Maintain full control while leveraging enterprise-scale actor orchestration.",
 			buttonText: "Contact Us",
 			buttonHref: "/sales",
 		},
@@ -40,7 +40,7 @@ export const RivetCloudSection = () => {
 			icon: faGithub,
 			title: "Self-Hosted",
 			description:
-				"Run Rivet on your own infrastructure. Completely open-source and free to use.",
+				"Run the open-source Rivet Engine on your own infrastructure with PostgreSQL or FoundationDB. Complete control over your actor orchestration platform.",
 			buttonText: "View on GitHub",
 			buttonHref: "https://github.com/rivet-gg/rivet",
 		},
@@ -50,11 +50,10 @@ export const RivetCloudSection = () => {
 		<div className="mx-auto max-w-7xl px-6 py-32 lg:py-40">
 			<div className="text-center mb-12">
 				<h2 className="text-4xl font-medium tracking-tight text-white">
-					Rivet on Any Cloud
+					Scale Your Rivet Engine Anywhere
 				</h2>
 				<p className="mt-4 text-lg text-white/70">
-					Choose the deployment model that works best for your
-					organization
+					Enterprise-scale actor orchestration with FoundationDB, connecting to your applications on any platform
 				</p>
 			</div>
 
diff --git a/site/src/app/(v2)/(marketing)/cloud/ServerlessLimitationsSection.tsx b/site/src/app/(v2)/(marketing)/cloud/ServerlessLimitationsSection.tsx
index 2c258190ce..4065ab9c02 100644
--- a/site/src/app/(v2)/(marketing)/cloud/ServerlessLimitationsSection.tsx
+++ b/site/src/app/(v2)/(marketing)/cloud/ServerlessLimitationsSection.tsx
@@ -73,11 +73,10 @@ export const ServerlessLimitationsSection = () => {
 		<div className="mx-auto max-w-7xl py-32 lg:py-40">
 			<div className="text-center mb-12">
 				<h2 className="text-4xl font-medium tracking-tight text-white">
-					Serverless without limitations
+					Rivet without limitations
 				</h2>
 				<p className="mt-4 text-lg text-white/70">
-					All the benefits of serverless with none of the traditional
-					constraints
+					All the benefits of Rivet on a managed cloud with custom features
 				</p>
 			</div>
 
diff --git a/site/src/app/(v2)/(marketing)/cloud/page.tsx b/site/src/app/(v2)/(marketing)/cloud/page.tsx
index 8f97c15dcf..6c5584a7d3 100644
--- a/site/src/app/(v2)/(marketing)/cloud/page.tsx
+++ b/site/src/app/(v2)/(marketing)/cloud/page.tsx
@@ -1,12 +1,10 @@
+import { ArchitectureSection } from "./ArchitectureSection";
 import { CommandCenterSection } from "./CommandCenterSection";
-import { CommunitySection } from "./CommunitySection";
-import { CtaButtons } from "./CtaButtons";
 import { CtaSection } from "./CtaSection";
-import { FeaturesGrid } from "./FeaturesGrid";
-import { PerformanceSection } from "./PerformanceSection";
-import { PowerfulPrimitivesSection } from "./PowerfulPrimitivesSection";
-import { RivetCloudSection } from "./RivetCloudSection";
 import { ServerlessLimitationsSection } from "./ServerlessLimitationsSection";
+import { Icon, faArrowRight } from "@rivet-gg/icons";
+import { MarketingButton } from "./MarketingButton";
+import Link from "next/link";
 
 export default function IndexPage() {
 	// an empty div at the top of the page is a workaround for a bug in Next.js that causes the page to jump when the user navigates to it
@@ -21,15 +19,11 @@ export default function IndexPage() {
 			{/* Content */}
 			<main className="min-h-screen w-full max-w-[1500px] mx-auto px-4 md:px-8">
 				<Hero />
-				<FeaturesGrid />
-				<PowerfulPrimitivesSection />
+				<ArchitectureSection />
 				<ServerlessLimitationsSection />
-				<PerformanceSection />
 				{/*<FrameworksSection />*/}
 				{/*<TutorialsSection />*/}
 				<CommandCenterSection />
-				<RivetCloudSection />
-				<CommunitySection />
 				<CtaSection />
 			</main>
 		</>
@@ -74,23 +68,10 @@ const Hero = () => {
 					{/* Title */}
 					<div className="space-y-6 text-center sm:text-left">
 						<h1 className="text-4xl sm:text-5xl md:text-6xl font-700 text-white leading-[1.3] sm:leading-[1.1] tracking-normal">
-							The open-source serverless cloud
+							Scale and manage your Actors on Rivet Cloud
 						</h1>
 						<p className="text-lg sm:text-xl leading-[1.2] tracking-tight font-500 text-white/40 max-w-lg mx-auto sm:mx-0">
-							Easily deploy & scale{" "}
-							<span className="text-white/90">AI agents</span>,{" "}
-							<span className="text-white/90">
-								complex workloads
-							</span>
-							, and{" "}
-							<span className="text-white/90">backends</span> —
-							all on a frictionless cloud.
-							{/*<span className="text-white/80">
-								Open-source
-							</span> &{" "}
-							<span className="text-white/80">
-								self-hostable
-							</span>.*/}
+							Rivet cloud scales actors that connect seamlessly to your applications deployed anywhere
 						</p>
 					</div>
 
@@ -98,7 +79,18 @@ const Hero = () => {
 
 					{/* CTA */}
 					<div className="flex justify-center sm:justify-start">
-						<CtaButtons />
+						<div className="flex flex-col sm:flex-row items-center sm:items-start gap-4">
+							<MarketingButton href="/talk-to-an-engineer" primary>
+								Get Started
+							</MarketingButton>
+							<MarketingButton href="/docs/cloud">
+								<span>Documentation</span>
+								<Icon
+									icon={faArrowRight}
+									className="ml-2 text-xs group-hover:translate-x-0.5 transition-transform duration-200"
+								/>
+							</MarketingButton>
+						</div>
 					</div>
 
 					{/*<div className="mt-4">
diff --git a/site/src/app/(v2)/(marketing)/pricing/PricingPageClient.tsx b/site/src/app/(v2)/(marketing)/pricing/PricingPageClient.tsx
index f17fdee97e..8f8622ebf9 100644
--- a/site/src/app/(v2)/(marketing)/pricing/PricingPageClient.tsx
+++ b/site/src/app/(v2)/(marketing)/pricing/PricingPageClient.tsx
@@ -1,26 +1,33 @@
 "use client";
 import { CheckIcon, MinusIcon, PlusIcon } from "@heroicons/react/16/solid";
 import { MobilePricingTabs } from "./components/MobilePricingTabs";
+import { useState } from "react";
+import clsx from "clsx";
+import Link from "next/link";
+import { Icon, faArrowRight } from "@rivet-gg/icons";
 
 const tiers = [
 	{
-		name: "Community",
+		name: "Free",
 		priceMonthly: "$0",
 		href: "https://hub.rivet.gg/",
 		highlights: [
-			{ description: "$5 Free credits", icon: "gift" },
+			{ description: "5GB Limit", icon: "check" },
+			{ description: "5 Million Writes /mo Limit", icon: "check" },
+			{ description: "200 Million Reads /mo Limit", icon: "check" },
+			{ description: "100GB Egress Limit", icon: "check" },
 			{ description: "Community Support", icon: "check" },
 		],
 	},
-	{
-		name: "Pro",
-		priceMonthly: "$20",
-		href: "https://hub.rivet.gg/",
+		{
+			name: "Hobby",
+			priceMonthly: "$5",
+			href: "https://hub.rivet.gg/",
 		highlights: [
-			{ description: "$20 Free credits /mo", icon: "gift" },
-			{ description: "Everything in Community", icon: "check" },
-			{ description: "No Usage Limits", icon: "check" },
-			{ description: "Unlimited Seats", icon: "check" },
+			{ description: "25 Billion Reads /mo included", icon: "gift" },
+			{ description: "50 Million Writes /mo included", icon: "gift" },
+			{ description: "5GB Storage included", icon: "gift" },
+			{ description: "1TB Egress included", icon: "gift" },
 			{ description: "Email Support", icon: "check" },
 		],
 	},
@@ -29,42 +36,69 @@ const tiers = [
 		priceMonthly: "$200",
 		href: "https://hub.rivet.gg/",
 		highlights: [
-			{ description: "$200 Free credits /mo", icon: "gift" },
-			{ description: "Everything in Pro", icon: "check" },
-			{ description: "Dedicated Hardware", icon: "check" },
-			{ description: "Custom Regions", icon: "check" },
+			{ description: "25 Billion Reads /mo included", icon: "gift" },
+			{ description: "50 Million Writes /mo included", icon: "gift" },
+			{ description: "5GB Storage included", icon: "gift" },
+			{ description: "1TB Egress included", icon: "gift" },
+			{ description: "MFA", icon: "check" },
 			{ description: "Slack Support", icon: "check" },
 		],
 	},
-	{
-		name: "Enterprise",
-		priceMonthly: "Custom",
-		href: "/sales",
-		highlights: [
-			{ description: "Everything in Team", icon: "check" },
-			{ description: "Priority Support", icon: "check" },
-			{ description: "SLA", icon: "check" },
-			{ description: "OIDC SSO provider", icon: "check" },
-			{ description: "On-Prem Deployment", icon: "check" },
-			{
-				description: "Custom Storage Reads, Writes, and Stored Data",
-				icon: "check",
-			},
-			{ description: "Custom Log Retention", icon: "check" },
-		],
-	},
+		{
+			name: "Enterprise",
+			priceMonthly: "Custom",
+			href: "/sales",
+			highlights: [
+				{ description: "Everything in Team", icon: "check" },
+				{ description: "Priority Support", icon: "check" },
+				{ description: "SLA", icon: "check" },
+				{ description: "OIDC SSO provider", icon: "check" },
+				{ description: "On-Prem Deployment", icon: "check" },
+				{ description: "Audit Logs", icon: "check" },
+				{ description: "Custom Roles", icon: "check" },
+				{ description: "Device Tracking", icon: "check" },
+				{ description: "Volume Pricing", icon: "check" },
+			],
+		},
 ];
 
 const sections = [
 	{
-		name: "Build Retention",
+		name: "Usage Included",
 		features: [
 			{
-				name: "Build Retention",
+				name: "Storage",
+				tiers: {
+					Free: "5GB",
+					Hobby: "5GB included",
+					Team: "5GB included",
+					Enterprise: "Custom",
+				},
+			},
+			{
+				name: "Reads per month",
+				tiers: {
+					Free: "200 Million",
+					Hobby: "25 Billion included",
+					Team: "25 Billion included", 
+					Enterprise: "Custom",
+				},
+			},
+			{
+				name: "Writes per month",
 				tiers: {
-					Community: "3 Days",
-					Pro: "30 Days",
-					Team: "6 Months",
+					Free: "5 Million",
+					Hobby: "50 Million included",
+					Team: "50 Million included",
+					Enterprise: "Custom",
+				},
+			},
+			{
+				name: "Egress",
+				tiers: {
+					Free: "100GB Limit",
+					Hobby: "1TB included",
+					Team: "1TB included",
 					Enterprise: "Custom",
 				},
 			},
@@ -76,8 +110,8 @@ const sections = [
 			{
 				name: "Support",
 				tiers: {
-					Community: "Community Support",
-					Pro: "Email",
+					Free: "Community Support",
+					Hobby: "Email",
 					Team: "Slack & Email",
 					Enterprise: "Slack & Email",
 				},
@@ -85,80 +119,69 @@ const sections = [
 		],
 	},
 	{
-		name: "Infrastructure Credits",
+		name: "Security & Enterprise",
 		features: [
 			{
-				name: "Credits",
+				name: "MFA",
 				tiers: {
-					Community: "$5.00 Credit",
-					Pro: "$20.00 Credits /Mo",
-					Team: "$200.00 Credits /Mo",
-					Enterprise: "Custom",
+					Free: false,
+					Hobby: false,
+					Team: true,
+					Enterprise: true,
 				},
 			},
-		],
-	},
-	{
-		name: "Regions",
-		features: [
 			{
-				name: "Regions",
+				name: "Custom Regions",
 				tiers: {
-					Community: "2 Regions",
-					Pro: "8 Regions",
-					Team: "Custom",
-					Enterprise: "Custom",
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
 				},
 			},
-		],
-	},
-	{
-		name: "Seat Limits",
-		features: [
 			{
-				name: "Seat Limits",
+				name: "SLA",
 				tiers: {
-					Community: "2 Seats",
-					Pro: "Unlimited",
-					Team: "Unlimited",
-					Enterprise: "Unlimited",
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
 				},
 			},
-		],
-	},
-	{
-		name: "Security",
-		features: [
 			{
-				name: "SSL Management",
+				name: "Audit Logs",
 				tiers: {
-					Community: true,
-					Pro: true,
-					Team: true,
+					Free: false,
+					Hobby: false,
+					Team: false,
 					Enterprise: true,
 				},
 			},
 			{
-				name: "DDoS Mitigation",
+				name: "Custom Roles",
 				tiers: {
-					Community: true,
-					Pro: true,
-					Team: true,
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
+				},
+			},
+			{
+				name: "Device Tracking",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: false,
 					Enterprise: true,
 				},
 			},
-		],
-	},
-	{
-		name: "Usage Limit",
-		features: [
 			{
-				name: "Usage Limit",
+				name: "Volume Pricing",
 				tiers: {
-					Community: "Limited",
-					Pro: "Unlimited",
-					Team: "Unlimited",
-					Enterprise: "Unlimited",
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
 				},
 			},
 		],
@@ -288,8 +311,8 @@ function PricingTiers() {
 								{tier.name}{" "}
 								<span className="sr-only">plan</span>
 							</h2>
-							<div className="mt-8 flex flex-col items-start gap-0 min-h-[120px]">
-								{(tier.name === "Pro" ||
+							<div className="mt-8 flex flex-col items-start gap-0 h-[120px]">
+								{(tier.name === "Hobby" ||
 									tier.name === "Team") && (
 									<div className="text-xs text-white/40 mb-1">
 										From
@@ -305,14 +328,14 @@ function PricingTiers() {
 										</span>
 									)}
 								</div>
-								{(tier.name === "Pro" ||
+								{(tier.name === "Hobby" ||
 									tier.name === "Team") && (
 									<div className="text-sm text-white/40 mt-1">
 										+ Usage
 									</div>
 								)}
 							</div>
-							<div className="mt-8 border-t border-white/10 pt-4">
+							<div className="mt-6 border-t border-white/10 pt-4">
 								<h3 className="text-sm font-normal text-white">
 									Includes:
 								</h3>
@@ -361,48 +384,220 @@ function PricingTiers() {
 	);
 }
 
+function UsagePricingTable() {
+	return (
+		<div className="mt-16">
+			<div className="text-center mb-8">
+				<h2 className="text-3xl font-600 text-white mb-4">
+					Usage Pricing
+				</h2>
+				<p className="text-lg text-white/60 max-w-2xl mx-auto">
+					Pay only for what you use beyond the included allowances
+				</p>
+			</div>
+			
+			<div className="max-w-2xl mx-auto">
+				<div className="bg-white/5 border border-white/10 rounded-lg overflow-hidden">
+					<table className="w-full">
+						<thead>
+							<tr className="border-b border-white/10">
+								<th className="px-6 py-4 text-left text-sm font-medium text-white">
+									Resource
+								</th>
+								<th className="px-6 py-4 text-right text-sm font-medium text-white">
+									Price
+								</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr className="border-b border-white/5">
+								<td className="px-6 py-4 text-sm text-white/80">
+									Storage
+								</td>
+								<td className="px-6 py-4 text-sm text-white text-right">
+									$0.40 per GB-month
+								</td>
+							</tr>
+							<tr className="border-b border-white/5">
+								<td className="px-6 py-4 text-sm text-white/80">
+									Reads
+								</td>
+								<td className="px-6 py-4 text-sm text-white text-right">
+									$1.00 per billion reads
+								</td>
+							</tr>
+									<tr className="border-b border-white/5">
+										<td className="px-6 py-4 text-sm text-white/80">
+											Writes
+										</td>
+										<td className="px-6 py-4 text-sm text-white text-right">
+											$1.00 per million writes
+										</td>
+									</tr>
+									<tr>
+										<td className="px-6 py-4 text-sm text-white/80">
+											Egress
+										</td>
+										<td className="px-6 py-4 text-sm text-white text-right">
+											$0.15 per GB
+										</td>
+									</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+interface ToggleProps {
+	options: { value: string; label: string }[];
+	activeValue: string;
+	onChange: (value: string) => void;
+}
+
+function Toggle({ options, activeValue, onChange }: ToggleProps) {
+	return (
+		<div className="flex items-center justify-center">
+			<div className="inline-flex items-center bg-white/5 border border-white/10 rounded-lg p-1">
+				{options.map((option) => (
+					<button
+						key={option.value}
+						onClick={() => onChange(option.value)}
+						className={clsx(
+							"px-4 py-2 text-sm font-medium rounded-md transition-all duration-200 whitespace-nowrap",
+							activeValue === option.value
+								? "bg-white/10 text-white border border-white/20"
+								: "text-white/60 hover:text-white/80 hover:bg-white/5"
+						)}
+					>
+						{option.label}
+					</button>
+				))}
+			</div>
+		</div>
+	);
+}
+
 export default function PricingPageClient() {
+	const [activeTab, setActiveTab] = useState("cloud");
+
+	const toggleOptions = [
+		{ value: "cloud", label: "Cloud" },
+		{ value: "selfhost", label: "Self-Host" },
+	];
+
 	return (
 		<main className="min-h-screen w-full max-w-[1500px] mx-auto md:px-8">
-			<div className="relative isolate overflow-hidden pb-8 sm:pb-10 pt-40">
+			<div className="relative isolate overflow-hidden pb-8 sm:pb-10 pt-48">
 				<div className="mx-auto max-w-[1200px] px-6 lg:px-8">
-					<div>
-						<h1 className="text-6xl font-700 text-white leading-[1.1] tracking-normal">
-							Rivet Cloud Pricing
+					<div className="text-center">
+						<h1 className="text-6xl font-normal text-white leading-[1.1] tracking-normal">
+							Rivet {activeTab === "cloud" ? "Cloud Pricing" : "Self-Host"}
 						</h1>
-						<p className="mt-6 max-w-2xl text-xl leading-[1.2] tracking-tight font-500 text-white/60">
-							Start with free and scale as you grow.
+						<p className="mt-6 max-w-2xl mx-auto text-xl leading-[1.2] tracking-tight font-extralight text-white/60">
+							{activeTab === "cloud" 
+								? "Start with free and scale as you grow."
+								: "Deploy Rivet on your own infrastructure."
+							}
 						</p>
+						<div className="mt-8">
+							<Toggle
+								options={toggleOptions}
+								activeValue={activeTab}
+								onChange={setActiveTab}
+							/>
+						</div>
 					</div>
 				</div>
 			</div>
 
-			<div className="relative mx-auto max-w-2xl px-6 lg:max-w-7xl lg:px-8 pt-16 sm:pt-24">
-				<PricingTiers />
-				<div className="flex flex-col items-center mt-16">
-					<a
-						href="/docs/cloud/pricing"
-						target="_self"
-						rel="noopener noreferrer"
-						className="text-xl font-medium flex items-center gap-2 cursor-pointer bg-transparent border-none p-0 text-white transition-colors duration-200 group group-hover:text-[#FF5C00]"
-					>
-						<span className="transition-colors duration-200 group-hover:text-[#FF5C00]">
-							View Usage Pricing
-						</span>
-						<span
-							aria-hidden="true"
-							className="text-2xl transition-all duration-200 group-hover:translate-x-1 group-hover:text-[#FF5C00]"
-						>
-							→
-						</span>
-					</a>
-				</div>
-			</div>
+			{activeTab === "cloud" ? (
+				<>
+					<div className="relative mx-auto max-w-2xl px-6 lg:max-w-7xl lg:px-8 pt-16 sm:pt-24">
+						<PricingTiers />
+						<UsagePricingTable />
+					</div>
 
-			<div className="mx-auto max-w-2xl px-6 pt-16 sm:pt-24 lg:max-w-7xl lg:px-8 pb-24">
-				<PricingTable />
-				<MobilePricingTabs />
-			</div>
+					<div className="mx-auto max-w-2xl px-6 pt-16 sm:pt-24 lg:max-w-7xl lg:px-8 pb-24">
+						<PricingTable />
+						<MobilePricingTabs />
+					</div>
+				</>
+			) : (
+				<div className="relative mx-auto max-w-2xl px-6 lg:max-w-7xl lg:px-8 pt-16 sm:pt-24 pb-24">
+					<div className="text-center">
+						<h2 className="text-3xl font-600 text-white mb-8">
+							Self-Hosted Rivet
+						</h2>
+						<p className="text-lg text-white/60 mb-12 max-w-2xl mx-auto">
+							Deploy Rivet on your own infrastructure with full control and no usage limits.
+						</p>
+						
+						<div className="grid grid-cols-1 md:grid-cols-2 gap-8 max-w-4xl mx-auto">
+							<div className="bg-white/5 border border-white/10 rounded-lg p-6 flex flex-col">
+								<h3 className="text-xl font-600 text-white mb-4">Open Source</h3>
+								<p className="text-white/60 mb-4">
+									Rivet is open source and free to use on your own infrastructure.
+								</p>
+								<ul className="space-y-2 text-white/80 mb-6">
+									<li className="flex items-center gap-2">
+										<CheckIcon className="w-4 h-4 text-green-400" />
+										No usage limits
+									</li>
+									<li className="flex items-center gap-2">
+										<CheckIcon className="w-4 h-4 text-green-400" />
+										Full source code access
+									</li>
+									<li className="flex items-center gap-2">
+										<CheckIcon className="w-4 h-4 text-green-400" />
+										Community support
+									</li>
+								</ul>
+								<div className="mt-auto">
+									<a
+										href="/docs/self-hosting"
+										className="inline-flex items-center justify-center w-full px-6 py-3 border border-white/20 text-white font-medium rounded-lg hover:bg-white/10 transition-colors"
+									>
+										Get Started
+									</a>
+								</div>
+							</div>
+							
+							<div className="bg-white/5 border border-white/10 rounded-lg p-6 flex flex-col">
+								<h3 className="text-xl font-600 text-white mb-4">Enterprise Support</h3>
+								<p className="text-white/60 mb-4">
+									Get professional support and additional features for your self-hosted deployment.
+								</p>
+								<ul className="space-y-2 text-white/80 mb-6">
+									<li className="flex items-center gap-2">
+										<CheckIcon className="w-4 h-4 text-green-400" />
+										Priority support
+									</li>
+									<li className="flex items-center gap-2">
+										<CheckIcon className="w-4 h-4 text-green-400" />
+										SLA guarantees
+									</li>
+									<li className="flex items-center gap-2">
+										<CheckIcon className="w-4 h-4 text-green-400" />
+										Custom integrations
+									</li>
+								</ul>
+								<div className="mt-auto">
+									<a
+										href="/sales"
+										className="inline-flex items-center justify-center w-full px-6 py-3 bg-white text-black font-medium rounded-lg hover:bg-white/90 transition-colors"
+									>
+										Contact Sales
+									</a>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			)}
 		</main>
 	);
 }
+
+
diff --git a/site/src/app/(v2)/(marketing)/pricing/components/MobilePricingTabs.tsx b/site/src/app/(v2)/(marketing)/pricing/components/MobilePricingTabs.tsx
index ce68c47527..64bdd2b0ab 100644
--- a/site/src/app/(v2)/(marketing)/pricing/components/MobilePricingTabs.tsx
+++ b/site/src/app/(v2)/(marketing)/pricing/components/MobilePricingTabs.tsx
@@ -6,80 +6,144 @@ import { Fragment } from "react";
 
 const tiers = [
 	{
-		name: "Starter",
-		href: "#",
+		name: "Free",
+		href: "https://hub.rivet.gg/",
 	},
 	{
-		name: "Growth",
-		href: "#",
+		name: "Hobby",
+		href: "https://hub.rivet.gg/",
 	},
 	{
-		name: "Scale",
-		href: "#",
+		name: "Team",
+		href: "https://hub.rivet.gg/",
+	},
+	{
+		name: "Enterprise",
+		href: "/sales",
 	},
 ];
 
 const sections = [
 	{
-		name: "Features",
+		name: "Usage Included",
 		features: [
 			{
-				name: "Edge content delivery",
-				tiers: { Starter: true, Growth: true, Scale: true },
+				name: "Storage",
+				tiers: {
+					Free: "5GB",
+					Hobby: "5GB included",
+					Team: "5GB included",
+					Enterprise: "Custom",
+				},
 			},
 			{
-				name: "Custom domains",
-				tiers: { Starter: "1", Growth: "3", Scale: "Unlimited" },
+				name: "Reads per month",
+				tiers: {
+					Free: "200 Million",
+					Hobby: "25 Billion included",
+					Team: "25 Billion included", 
+					Enterprise: "Custom",
+				},
 			},
 			{
-				name: "Team members",
-				tiers: { Starter: "3", Growth: "20", Scale: "Unlimited" },
+				name: "Writes per month",
+				tiers: {
+					Free: "5 Million",
+					Hobby: "50 Million included",
+					Team: "50 Million included",
+					Enterprise: "Custom",
+				},
 			},
 			{
-				name: "Single sign-on (SSO)",
-				tiers: { Starter: false, Growth: false, Scale: true },
+				name: "Egress",
+				tiers: {
+					Free: "100GB Limit",
+					Hobby: "1TB included",
+					Team: "1TB included",
+					Enterprise: "Custom",
+				},
 			},
 		],
 	},
 	{
-		name: "Reporting",
+		name: "Support",
 		features: [
 			{
-				name: "Advanced analytics",
-				tiers: { Starter: true, Growth: true, Scale: true },
+				name: "Support",
+				tiers: {
+					Free: "Community Support",
+					Hobby: "Email",
+					Team: "Slack & Email",
+					Enterprise: "Slack & Email",
+				},
 			},
+		],
+	},
+	{
+		name: "Security & Enterprise",
+		features: [
 			{
-				name: "Basic reports",
-				tiers: { Starter: false, Growth: true, Scale: true },
+				name: "MFA",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: true,
+					Enterprise: true,
+				},
 			},
 			{
-				name: "Professional reports",
-				tiers: { Starter: false, Growth: false, Scale: true },
+				name: "Custom Regions",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
+				},
 			},
 			{
-				name: "Custom report builder",
-				tiers: { Starter: false, Growth: false, Scale: true },
+				name: "SLA",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
+				},
 			},
-		],
-	},
-	{
-		name: "Support",
-		features: [
 			{
-				name: "24/7 online support",
-				tiers: { Starter: true, Growth: true, Scale: true },
+				name: "Audit Logs",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
+				},
 			},
 			{
-				name: "Quarterly workshops",
-				tiers: { Starter: false, Growth: true, Scale: true },
+				name: "Custom Roles",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
+				},
 			},
 			{
-				name: "Priority phone support",
-				tiers: { Starter: false, Growth: false, Scale: true },
+				name: "Device Tracking",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
+				},
 			},
 			{
-				name: "1:1 onboarding tour",
-				tiers: { Starter: false, Growth: false, Scale: true },
+				name: "Volume Pricing",
+				tiers: {
+					Free: false,
+					Hobby: false,
+					Team: false,
+					Enterprise: true,
+				},
 			},
 		],
 	},
@@ -87,13 +151,76 @@ const sections = [
 
 export function MobilePricingTabs() {
 	return (
-		<div className="sm:hidden">
+		<div className="sm:hidden [&_.tab]:!text-white/60 [&_.tab[data-selected]]:!text-white [&_.tab[data-selected]]:!border-white [&_.tab]:!border-white/10">
+			{/* Usage Pricing Table for Mobile */}
+			<div className="mt-16">
+				<div className="text-center mb-8">
+					<h2 className="text-3xl font-600 text-white mb-4">
+						Usage Pricing
+					</h2>
+					<p className="text-lg text-white/60 max-w-2xl mx-auto">
+						Pay only for what you use beyond the included allowances
+					</p>
+				</div>
+
+				<div className="max-w-2xl mx-auto">
+					<div className="bg-white/5 border border-white/10 rounded-lg overflow-hidden">
+						<table className="w-full">
+							<thead>
+								<tr className="border-b border-white/10">
+									<th className="px-6 py-4 text-left text-sm font-medium text-white">
+										Resource
+									</th>
+									<th className="px-6 py-4 text-right text-sm font-medium text-white">
+										Price
+									</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr className="border-b border-white/5">
+									<td className="px-6 py-4 text-sm text-white/80">
+										Storage
+									</td>
+									<td className="px-6 py-4 text-sm text-white text-right">
+										$0.40 per GB-month
+									</td>
+								</tr>
+								<tr className="border-b border-white/5">
+									<td className="px-6 py-4 text-sm text-white/80">
+										Reads
+									</td>
+									<td className="px-6 py-4 text-sm text-white text-right">
+										$1.00 per billion reads
+									</td>
+								</tr>
+								<tr className="border-b border-white/5">
+									<td className="px-6 py-4 text-sm text-white/80">
+										Writes
+									</td>
+									<td className="px-6 py-4 text-sm text-white text-right">
+										$1.00 per million writes
+									</td>
+								</tr>
+								<tr>
+									<td className="px-6 py-4 text-sm text-white/80">
+										Egress
+									</td>
+									<td className="px-6 py-4 text-sm text-white text-right">
+										$0.15 per GB
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+
 			<Tab.Group>
 				<Tab.List className="flex">
 					{tiers.map((tier) => (
 						<Tab
 							key={tier.name}
-							className="w-1/3 border-b border-gray-800 py-4 text-base/8 font-medium text-indigo-400 data-[selected]:border-indigo-400 [&:not([data-focus])]:focus:outline-none"
+							className="w-1/4 border-b border-white/10 py-4 text-base/8 font-medium text-white/60 data-[selected]:border-white data-[selected]:text-white [&:not([data-focus])]:focus:outline-none"
 						>
 							{tier.name}
 						</Tab>
@@ -104,22 +231,22 @@ export function MobilePricingTabs() {
 						<Tab.Panel key={tier.name}>
 							<a
 								href={tier.href}
-								className="mt-8 block rounded-md bg-gray-900 px-3.5 py-2.5 text-center text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white/10 hover:bg-gray-800"
+								className="mt-8 block rounded-xl bg-[#FF5C00]/90 hover:bg-[#FF5C00] hover:brightness-110 text-white px-6 py-3 text-center text-sm font-medium transition-all duration-200 active:scale-[0.97]"
 							>
 								Get started
 							</a>
 							{sections.map((section) => (
 								<Fragment key={section.name}>
-									<div className="-mx-6 mt-10 rounded-lg bg-gray-900 px-6 py-3 text-sm/6 font-semibold text-white group-first-of-type:mt-5">
+									<div className="-mx-6 mt-10 rounded-lg bg-white/5 px-6 py-3 text-sm/6 font-semibold text-white group-first-of-type:mt-5">
 										{section.name}
 									</div>
 									<dl>
 										{section.features.map((feature) => (
 											<div
 												key={feature.name}
-												className="grid grid-cols-2 border-b border-gray-800 py-4 last:border-none"
+												className="grid grid-cols-2 border-b border-white/5 py-4 last:border-none"
 											>
-												<dt className="text-sm/6 font-normal text-gray-300">
+												<dt className="text-sm/6 font-normal text-white/70">
 													{feature.name}
 												</dt>
 												<dd className="text-center">
@@ -145,7 +272,7 @@ export function MobilePricingTabs() {
 															) : (
 																<MinusIcon
 																	aria-hidden="true"
-																	className="inline-block size-4 fill-gray-600"
+																	className="inline-block size-4 fill-white/10"
 																/>
 															)}
 
diff --git a/site/src/app/(v2)/(marketing)/startups/page.tsx b/site/src/app/(v2)/(marketing)/startups/page.tsx
new file mode 100644
index 0000000000..7a7b14602b
--- /dev/null
+++ b/site/src/app/(v2)/(marketing)/startups/page.tsx
@@ -0,0 +1,178 @@
+import { Icon, faCheck, faArrowRight } from "@rivet-gg/icons";
+import Link from "next/link";
+
+export default function StartupsPage() {
+	return (
+		<main className="min-h-screen w-full max-w-[1500px] mx-auto px-4 md:px-8">
+			<div className="relative isolate overflow-hidden pb-8 sm:pb-10 pt-48">
+				<div className="mx-auto max-w-[1200px] px-6 lg:px-8">
+					<div className="text-center">
+						<h1 className="text-4xl md:text-5xl font-normal text-white leading-[1.3] sm:leading-[1.1] tracking-[-0.03em] max-w-full">
+							Startup Program
+						</h1>
+						<div className="h-5" />
+						<p className="max-w-3xl text-lg sm:text-xl leading-7 font-light text-white/40 mx-auto">
+							Get 50% off Rivet Cloud for your first year. Build stateful, real-time applications with our enterprise-scale actor orchestration platform.
+						</p>
+					</div>
+				</div>
+			</div>
+
+			{/* YC Special Discount Banner */}
+			<div className="py-16 sm:py-20">
+				<div className="max-w-4xl mx-auto px-6 lg:px-8">
+					<div className="bg-white/5 border border-white/10 rounded-lg p-6">
+						<div className="text-center">
+							<h3 className="text-lg font-medium text-white mb-3">
+								Special Discount for YC & Speedrun companies
+							</h3>
+							<p className="text-white/70 mb-4">
+								Rivet is a YC W23 and SR002 alum. If you're a current YC/Speedrun company or an alum, you're eligible for additional startup program benefits.
+							</p>
+							<div className="flex items-center justify-center gap-4 flex-wrap">
+								<Link
+									href="https://www.ycombinator.com"
+									target="_blank"
+									className="text-white/80 hover:text-white transition-colors underline decoration-dotted"
+								>
+									<span className="text-sm font-medium">Bookface Deal</span>
+								</Link>
+								<span className="text-white/40">•</span>
+								<Link
+									href="https://speedrun.com"
+									target="_blank"
+									className="text-white/80 hover:text-white transition-colors underline decoration-dotted"
+								>
+									<span className="text-sm font-medium">Speedrun Deal</span>
+								</Link>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div className="max-w-4xl mx-auto px-6 lg:px-8">
+
+				{/* Benefits */}
+				<div className="py-16 sm:py-20">
+					<h2 className="text-2xl font-normal mb-8">What you get</h2>
+					<div className="grid md:grid-cols-2 gap-6">
+						<div className="flex items-start gap-3">
+							<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+							<div>
+								<h3 className="font-medium mb-2">50% off for 12 months</h3>
+								<p className="text-white/70">Get significant savings on Hobby and Team plans during your first year</p>
+							</div>
+						</div>
+						<div className="flex items-start gap-3">
+							<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+							<div>
+								<h3 className="font-medium mb-2">Enterprise features</h3>
+								<p className="text-white/70">Access to FoundationDB backend, multi-region deployment, and advanced security</p>
+							</div>
+						</div>
+						<div className="flex items-start gap-3">
+							<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+							<div>
+								<h3 className="font-medium mb-2">Priority support</h3>
+								<p className="text-white/70">Direct access to our engineering team for technical guidance</p>
+							</div>
+						</div>
+						<div className="flex items-start gap-3">
+							<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+							<div>
+								<h3 className="font-medium mb-2">Technical consultation</h3>
+								<p className="text-white/70">Architecture review and best practices for scaling your application</p>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				{/* Requirements */}
+				<div className="py-16 sm:py-20">
+					<h2 className="text-2xl font-normal mb-8">Requirements</h2>
+					<div className="space-y-4">
+							<div className="flex items-start gap-3">
+								<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+								<div>
+									<p className="text-white/70">Less than $5M in venture funding or bootstrapped</p>
+								</div>
+							</div>
+							<div className="flex items-start gap-3">
+								<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+								<div>
+									<p className="text-white/70">Less than 10 employees</p>
+								</div>
+							</div>
+							<div className="flex items-start gap-3">
+								<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+								<div>
+									<p className="text-white/70">Incorporated less than 5 years ago</p>
+								</div>
+							</div>
+							<div className="flex items-start gap-3">
+								<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+								<div>
+									<p className="text-white/70">Privately held & independent</p>
+								</div>
+							</div>
+							<div className="flex items-start gap-3">
+								<Icon icon={faCheck} className="text-green-500 mt-1 flex-shrink-0" />
+								<div>
+									<p className="text-white/70">New Rivet Cloud customer</p>
+								</div>
+							</div>
+					</div>
+				</div>
+
+				{/* Application Process */}
+				<div className="py-16 sm:py-20">
+					<h2 className="text-2xl font-normal mb-8">How to apply</h2>
+					<div className="space-y-6">
+						<div className="flex gap-4">
+							<div className="bg-white/10 rounded-full w-8 h-8 flex items-center justify-center text-sm font-medium flex-shrink-0">
+								1
+							</div>
+							<div>
+								<h3 className="font-medium mb-2">Submit your application</h3>
+								<p className="text-white/70">Fill out our startup program application with details about your company and use case</p>
+							</div>
+						</div>
+						<div className="flex gap-4">
+							<div className="bg-white/10 rounded-full w-8 h-8 flex items-center justify-center text-sm font-medium flex-shrink-0">
+								2
+							</div>
+							<div>
+								<h3 className="font-medium mb-2">Review process</h3>
+								<p className="text-white/70">Our team will review your application and get back to you within 5 business days</p>
+							</div>
+						</div>
+						<div className="flex gap-4">
+							<div className="bg-white/10 rounded-full w-8 h-8 flex items-center justify-center text-sm font-medium flex-shrink-0">
+								3
+							</div>
+							<div>
+								<h3 className="font-medium mb-2">Get started</h3>
+								<p className="text-white/70">Once approved, you'll receive your discount code and can start building with Rivet Cloud</p>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				{/* CTA */}
+				<div className="py-24 sm:py-32 text-center">
+					<Link
+						href="/sales"
+						className="inline-flex items-center gap-2 bg-[#FF5C00]/90 hover:bg-[#FF5C00] hover:brightness-110 text-white px-8 py-4 rounded-xl font-medium transition-all duration-200 active:scale-[0.97]"
+					>
+						Apply for startup program
+						<Icon icon={faArrowRight} />
+					</Link>
+					<p className="text-white/60 mt-4">
+						Questions? <Link href="/support" className="text-white hover:underline">Contact us</Link>
+					</p>
+				</div>
+			</div>
+		</main>
+	);
+}
diff --git a/site/src/components/DocsNavigation.tsx b/site/src/components/DocsNavigation.tsx
index f4ddf38133..d7bd5fc3b0 100644
--- a/site/src/components/DocsNavigation.tsx
+++ b/site/src/components/DocsNavigation.tsx
@@ -147,7 +147,7 @@ export function NavLink({
 
 	return (
 		<ActiveLink
-			strict
+			strict="true"
 			href={href}
 			target={external && "_blank"}
 			className={cn(
diff --git a/site/src/components/Footer.jsx b/site/src/components/Footer.jsx
index 3fdf34aacd..3c07c03a30 100644
--- a/site/src/components/Footer.jsx
+++ b/site/src/components/Footer.jsx
@@ -18,7 +18,9 @@ import {
 } from "@rivet-gg/icons";
 
 const footer = {
-	product: [{ name: "Actors", href: "/docs/actors" }],
+	product: [
+		{ name: "Actors", href: "/docs/actors" }
+	],
 	devs: [
 		{ name: "Documentation", href: "/docs/actors" },
 		// { name: "Integrations", href: "/integrations" },
@@ -34,6 +36,7 @@ const footer = {
 			href: "/rivet-vs-cloudflare-workers",
 		},
 		{ name: "Pricing", href: "/pricing" },
+		{ name: "Support", href: "/support" },
 		{ name: "Talk to an engineer", href: "/talk-to-an-engineer" },
 		{ name: "Sales", href: "/sales" },
 		{ name: "Open-Source Friends", href: "/oss-friends" },
@@ -137,7 +140,7 @@ function SmallPrint() {
 					{/* Logo */}
 					<Image className="size-12" src={imgLogo} alt="Rivet" />
 					<p className="text-sm leading-6 text-gray-300">
-						The open-source alternative to Durable Objects
+						Build and scale stateful workloads
 					</p>
 
 					{/* Social */}
diff --git a/site/src/components/TutorialVideo.jsx b/site/src/components/TutorialVideo.jsx
index b3f3910048..b5c6ba4326 100644
--- a/site/src/components/TutorialVideo.jsx
+++ b/site/src/components/TutorialVideo.jsx
@@ -1,13 +1,14 @@
 export function TutorialVideo({ videoId }) {
 	return (
-		<iframe
-			width="560"
-			height="315"
-			src={`https://www.youtube-nocookie.com/embed/${videoId}`}
-			title="YouTube video player"
-			frameBorder="0"
-			allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-			allowFullScreen
-		/>
+		<div className="relative w-full" style={{ paddingBottom: '56.25%' }}>
+			<iframe
+				className="absolute top-0 left-0 w-full h-full"
+				src={`https://www.youtube-nocookie.com/embed/${videoId}`}
+				title="YouTube video player"
+				frameBorder="0"
+				allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+				allowFullScreen
+			/>
+		</div>
 	);
 }
diff --git a/site/src/components/v2/Header.tsx b/site/src/components/v2/Header.tsx
index 4dc44ec93f..874daf7ea5 100644
--- a/site/src/components/v2/Header.tsx
+++ b/site/src/components/v2/Header.tsx
@@ -159,30 +159,30 @@ export function Header({
 						}
 						breadcrumbs={
 							<div className="flex items-center font-v2 subpixel-antialiased">
-								<TextNavItem
-									href="/docs"
-									ariaCurrent={
-										active === "docs" ? "page" : undefined
-									}
-								>
-									Documentation
-								</TextNavItem>
-								<TextNavItem
-									href="/cloud"
-									ariaCurrent={
-										active === "cloud" ? "page" : undefined
-									}
-								>
-									Cloud
-								</TextNavItem>
-								<TextNavItem
-									href="/changelog"
-									ariaCurrent={
-										active === "blog" ? "page" : undefined
-									}
-								>
-									Changelog
-								</TextNavItem>
+						<TextNavItem
+							href="/docs"
+							ariaCurrent={
+								active === "docs" ? "page" : undefined
+							}
+						>
+							Documentation
+						</TextNavItem>
+						<TextNavItem
+							href="/pricing"
+							ariaCurrent={
+								active === "pricing" ? "page" : undefined
+							}
+						>
+							Pricing
+						</TextNavItem>
+						<TextNavItem
+							href="/changelog"
+							ariaCurrent={
+								active === "blog" ? "page" : undefined
+							}
+						>
+							Changelog
+						</TextNavItem>
 							</div>
 						}
 					/>
@@ -249,24 +249,24 @@ export function Header({
 			mobileBreadcrumbs={<DocsMobileNavigation tree={mobileSidebar} />}
 			breadcrumbs={
 				<div className="flex items-center font-v2 subpixel-antialiased">
-					<TextNavItem
-						href="/docs"
-						ariaCurrent={active === "docs" ? "page" : undefined}
-					>
-						Documentation
-					</TextNavItem>
-					<TextNavItem
-						href="/cloud"
-						ariaCurrent={active === "cloud" ? "page" : undefined}
-					>
-						Cloud
-					</TextNavItem>
-					<TextNavItem
-						href="/changelog"
-						ariaCurrent={active === "blog" ? "page" : undefined}
-					>
-						Changelog
-					</TextNavItem>
+				<TextNavItem
+					href="/docs"
+					ariaCurrent={active === "docs" ? "page" : undefined}
+				>
+					Documentation
+				</TextNavItem>
+				<TextNavItem
+					href="/pricing"
+					ariaCurrent={active === "pricing" ? "page" : undefined}
+				>
+					Pricing
+				</TextNavItem>
+				<TextNavItem
+					href="/changelog"
+					ariaCurrent={active === "blog" ? "page" : undefined}
+				>
+					Changelog
+				</TextNavItem>
 				</div>
 			}
 		/>
@@ -276,43 +276,50 @@ export function Header({
 function DocsMobileNavigation({ tree }) {
 	const pathname = usePathname() || "";
 
-	const docsLinks = [
-		{ href: "/docs/actors", label: "Actors" },
-		{ href: "/docs/cloud", label: "Cloud" },
+	const mainNavLinks = [
+		{ href: "/pricing", label: "Pricing" },
+		{ href: "/changelog", label: "Changelog" },
+		{ href: "/docs", label: "Documentation" },
 	];
 
-	const otherLinks = [
-		{ href: "/changelog", label: "Changelog" },
-		{ href: "/pricing", label: "Pricing" },
+	const docsSubLinks = [
+		{ href: "/docs/actors", label: "Actors" },
+		{ href: "/docs/integrations", label: "Integrations" },
+		{ href: "/docs/general", label: "Reference" },
+		{ href: "/docs/self-hosting", label: "Self-Hosting" },
+		{ href: "/docs/cloud", label: "Enterprise Cloud" },
 	];
 
+	// Create a filtered tree that excludes the problematic section headers
+	const filteredTree = tree ? (
+		<div className="[&_.text-muted-foreground]:hidden">
+			{tree}
+		</div>
+	) : null;
+
 	return (
 		<div className="flex flex-col gap-4 font-v2 subpixel-antialiased">
-			{/* Docs section */}
-			<div className="text-foreground">Documentation</div>
+			{/* Main navigation */}
+			{mainNavLinks.map(({ href, label }) => (
+				<RivetHeader.NavItem key={href} asChild>
+					<ActiveLink href={href}>
+						{label}
+					</ActiveLink>
+				</RivetHeader.NavItem>
+			))}
+
+			{/* Documentation sub-links */}
 			<div className="">
-				{docsLinks.map(({ href, label }) => (
+				{docsSubLinks.map(({ href, label }) => (
 					<div key={href} className="ml-2">
 						<RivetHeader.NavItem asChild>
-							<ActiveLink includeChildren tree={tree} href={href}>
+							<ActiveLink href={href}>
 								{label}
 							</ActiveLink>
 						</RivetHeader.NavItem>
 					</div>
 				))}
 			</div>
-
-			{/* Other links */}
-			{otherLinks.map(({ href, external, label }) => (
-				<RivetHeader.NavItem key={href} asChild>
-					<ActiveLink
-						href={href}
-						target={external ? "_blank" : undefined}
-					>
-						{label}
-					</ActiveLink>
-				</RivetHeader.NavItem>
-			))}
 		</div>
 	);
 }
diff --git a/site/src/content/docs/self-hosting/railway.mdx b/site/src/content/docs/self-hosting/railway.mdx
index b103baca3c..fa929e9b1d 100644
--- a/site/src/content/docs/self-hosting/railway.mdx
+++ b/site/src/content/docs/self-hosting/railway.mdx
@@ -12,9 +12,28 @@ Railway provides a simple platform for deploying Rivet Engine with automatic sca
 
 Choose the template that best fits your needs:
 
-| **Rivet Template** | **Rivet Starter** |
-|-------------------|-------------------|
-| [![Deploy on Railway](https://railway.com/button.svg)](https://railway.com/deploy/rivet?referralCode=RC7bza&utm_medium=integration&utm_source=template&utm_campaign=generic) | [![Deploy Rivet Starter](https://railway.com/button.svg)](https://railway.com/deploy/rivet-starter) |
+<div style={{display: 'table', width: '100%'}}>
+  <div style={{display: 'table-row'}}>
+    <div style={{display: 'table-cell', width: '50%', textAlign: 'left', padding: '10px', verticalAlign: 'top'}}>
+      <div style={{fontWeight: 'bold', marginBottom: '10px'}}>Rivet Template</div>
+    </div>
+    <div style={{display: 'table-cell', width: '50%', textAlign: 'left', padding: '10px', verticalAlign: 'top'}}>
+      <div style={{fontWeight: 'bold', marginBottom: '10px'}}>Rivet Starter</div>
+    </div>
+  </div>
+  <div style={{display: 'table-row'}}>
+    <div style={{display: 'table-cell', width: '50%', textAlign: 'center', padding: '10px', verticalAlign: 'top'}}>
+      <a href="https://railway.com/deploy/rivet?referralCode=RC7bza&utm_medium=integration&utm_source=template&utm_campaign=generic" target="_blank" rel="noopener noreferrer">
+        <img src="https://railway.com/button.svg" alt="Deploy on Railway" style={{height: '40px', width: '200px'}} />
+      </a>
+    </div>
+    <div style={{display: 'table-cell', width: '50%', textAlign: 'center', padding: '10px', verticalAlign: 'top'}}>
+      <a href="https://railway.com/deploy/rivet-starter" target="_blank" rel="noopener noreferrer">
+        <img src="https://railway.com/button.svg" alt="Deploy Rivet Starter" style={{height: '40px', width: '200px'}} />
+      </a>
+    </div>
+  </div>
+</div>
 | **Blank template** to start fresh | **Complete example** with chat app |
 | - Rivet Engine | - Pre-configured Rivet Engine |
 | - PostgreSQL database | - Example chat application with Actors |
diff --git a/site/src/sitemap/mod.ts b/site/src/sitemap/mod.ts
index 9dd1ec715e..89f08ce29a 100644
--- a/site/src/sitemap/mod.ts
+++ b/site/src/sitemap/mod.ts
@@ -71,6 +71,10 @@ import {
 // - People who want to run Open Source
 
 export const sitemap = [
+	{
+		title: "Pricing",
+		href: "/pricing",
+	},
 	{
 		title: "Documentation",
 		href: "/docs",