diff --git a/demos/ai-chat/app/pages/layout.tsx b/demos/ai-chat/app/pages/layout.tsx
index ae1b274..3856470 100644
--- a/demos/ai-chat/app/pages/layout.tsx
+++ b/demos/ai-chat/app/pages/layout.tsx
@@ -68,11 +68,9 @@ export default function PagesLayout({
 									</Link>
 									<a
 										href="/api/data/reference"
-										target="_blank"
-										rel="noopener noreferrer"
 										className="text-muted-foreground hover:text-foreground transition-colors"
 									>
-										API Docs ↗
+										API Docs
 									</a>
 									<Link
 										href="/pages/route-docs"
diff --git a/demos/ai-chat/package.json b/demos/ai-chat/package.json
index eff27ac..116c12b 100644
--- a/demos/ai-chat/package.json
+++ b/demos/ai-chat/package.json
@@ -29,7 +29,7 @@
     "highlight.js": "^11.11.1",
     "katex": "^0.16.35",
     "lucide-react": "^0.577.0",
-    "next": "15.4.1",
+    "next": "16.1.6",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "19.2.3",
diff --git a/demos/blog/app/pages/layout.tsx b/demos/blog/app/pages/layout.tsx
index ac11e9a..d2726f6 100644
--- a/demos/blog/app/pages/layout.tsx
+++ b/demos/blog/app/pages/layout.tsx
@@ -59,11 +59,9 @@ export default function PagesLayout({
 								</Link>
 								<a
 									href="/api/data/reference"
-									target="_blank"
-									rel="noopener noreferrer"
 									className="text-muted-foreground hover:text-foreground transition-colors"
 								>
-									API Docs ↗
+									API Docs
 								</a>
 								<Link
 									href="/pages/route-docs"
diff --git a/demos/blog/package.json b/demos/blog/package.json
index 2ba17da..798f9f3 100644
--- a/demos/blog/package.json
+++ b/demos/blog/package.json
@@ -28,7 +28,7 @@
     "highlight.js": "^11.11.1",
     "katex": "^0.16.35",
     "lucide-react": "^0.577.0",
-    "next": "15.4.1",
+    "next": "16.1.6",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "19.2.3",
diff --git a/demos/cms/app/pages/layout.tsx b/demos/cms/app/pages/layout.tsx
index b06d363..28ccac9 100644
--- a/demos/cms/app/pages/layout.tsx
+++ b/demos/cms/app/pages/layout.tsx
@@ -55,11 +55,9 @@ export default function PagesLayout({
 								</Link>
 								<a
 									href="/api/data/reference"
-									target="_blank"
-									rel="noopener noreferrer"
 									className="text-muted-foreground hover:text-foreground transition-colors"
 								>
-									API Docs ↗
+									API Docs
 								</a>
 								<Link
 									href="/pages/route-docs"
diff --git a/demos/cms/package.json b/demos/cms/package.json
index 2ec66e8..e0da6af 100644
--- a/demos/cms/package.json
+++ b/demos/cms/package.json
@@ -45,7 +45,7 @@
     "highlight.js": "^11.11.1",
     "katex": "^0.16.35",
     "lucide-react": "^0.577.0",
-    "next": "15.4.1",
+    "next": "16.1.6",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "19.2.3",
diff --git a/demos/form-builder/app/pages/layout.tsx b/demos/form-builder/app/pages/layout.tsx
index 361fd22..44d84d9 100644
--- a/demos/form-builder/app/pages/layout.tsx
+++ b/demos/form-builder/app/pages/layout.tsx
@@ -55,11 +55,9 @@ export default function PagesLayout({
 								</Link>
 								<a
 									href="/api/data/reference"
-									target="_blank"
-									rel="noopener noreferrer"
 									className="text-muted-foreground hover:text-foreground transition-colors"
 								>
-									API Docs ↗
+									API Docs
 								</a>
 								<Link
 									href="/pages/route-docs"
diff --git a/demos/form-builder/package.json b/demos/form-builder/package.json
index a059473..c9bcfe7 100644
--- a/demos/form-builder/package.json
+++ b/demos/form-builder/package.json
@@ -31,7 +31,7 @@
     "highlight.js": "^11.11.1",
     "katex": "^0.16.35",
     "lucide-react": "^0.577.0",
-    "next": "15.4.1",
+    "next": "16.1.6",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "19.2.3",
diff --git a/demos/kanban/app/pages/layout.tsx b/demos/kanban/app/pages/layout.tsx
index 7a50504..9852635 100644
--- a/demos/kanban/app/pages/layout.tsx
+++ b/demos/kanban/app/pages/layout.tsx
@@ -57,11 +57,9 @@ export default function PagesLayout({
 								</Link>
 								<a
 									href="/api/data/reference"
-									target="_blank"
-									rel="noopener noreferrer"
 									className="text-muted-foreground hover:text-foreground transition-colors"
 								>
-									API Docs ↗
+									API Docs
 								</a>
 								<Link
 									href="/pages/route-docs"
diff --git a/demos/kanban/package.json b/demos/kanban/package.json
index 1ed3976..26c02bb 100644
--- a/demos/kanban/package.json
+++ b/demos/kanban/package.json
@@ -30,7 +30,7 @@
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
     "lucide-react": "^0.577.0",
-    "next": "15.4.1",
+    "next": "16.1.6",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "19.2.3",
diff --git a/demos/ui-builder/app/pages/layout.tsx b/demos/ui-builder/app/pages/layout.tsx
index 566671b..546ab68 100644
--- a/demos/ui-builder/app/pages/layout.tsx
+++ b/demos/ui-builder/app/pages/layout.tsx
@@ -68,11 +68,9 @@ export default function PagesLayout({
 								</Link>
 								<a
 									href="/api/data/reference"
-									target="_blank"
-									rel="noopener noreferrer"
 									className="text-muted-foreground hover:text-foreground transition-colors"
 								>
-									API Docs ↗
+									API Docs
 								</a>
 								<Link
 									href="/pages/route-docs"
diff --git a/demos/ui-builder/package.json b/demos/ui-builder/package.json
index 52cb11f..23162df 100644
--- a/demos/ui-builder/package.json
+++ b/demos/ui-builder/package.json
@@ -46,7 +46,7 @@
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
     "lucide-react": "^0.577.0",
-    "next": "15.4.1",
+    "next": "16.1.6",
     "next-themes": "^0.4.6",
     "radix-ui": "^1.4.3",
     "react": "19.2.3",
diff --git a/docs/content/docs/demos/ai-chat.mdx b/docs/content/docs/demos/ai-chat.mdx
index 3091369..a22efc9 100644
--- a/docs/content/docs/demos/ai-chat.mdx
+++ b/docs/content/docs/demos/ai-chat.mdx
@@ -15,7 +15,4 @@ A standalone Next.js demo showcasing the `ai-chat` plugin in **public mode** (no
 To enable AI responses in StackBlitz, add your `OPENAI_API_KEY` to the `.env.local` file (copy from `.env.local.example`).
 </Callout>
 
-<iframe
-  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/ai-chat?embed=1&startScript=dev&file=lib%2Fstack.ts"
-  style={{ width: '100%', height: '700px', border: 0, borderRadius: '8px' }}
-/>
+[Open in CodeSandbox →](https://codesandbox.io/p/devbox/github/better-stack-ai/better-stack/tree/main/demos/ai-chat)
diff --git a/docs/content/docs/demos/blog.mdx b/docs/content/docs/demos/blog.mdx
index 0a0be7a..eb19a12 100644
--- a/docs/content/docs/demos/blog.mdx
+++ b/docs/content/docs/demos/blog.mdx
@@ -12,7 +12,4 @@ A standalone Next.js demo showcasing the `blog` plugin. Three sample posts are s
 - API Docs at `/api/data/reference` (OpenAPI Scalar)
 - Route Docs at `/pages/route-docs`
 
-<iframe
-  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/blog?embed=1&startScript=dev&file=lib%2Fstack.ts"
-  style={{ width: '100%', height: '700px', border: 0, borderRadius: '8px' }}
-/>
+[Open in CodeSandbox →](https://codesandbox.io/p/devbox/github/better-stack-ai/better-stack/tree/main/demos/blog)
diff --git a/docs/content/docs/demos/cms.mdx b/docs/content/docs/demos/cms.mdx
index 1b9a312..bdf09ae 100644
--- a/docs/content/docs/demos/cms.mdx
+++ b/docs/content/docs/demos/cms.mdx
@@ -11,7 +11,4 @@ A standalone Next.js demo showcasing the `cms` plugin. An `Article` content type
 - API Docs at `/api/data/reference` (OpenAPI Scalar)
 - Route Docs at `/pages/route-docs`
 
-<iframe
-  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/cms?embed=1&startScript=dev&file=lib%2Fstack.ts"
-  style={{ width: '100%', height: '700px', border: 0, borderRadius: '8px' }}
-/>
+[Open in CodeSandbox →](https://codesandbox.io/p/devbox/github/better-stack-ai/better-stack/tree/main/demos/cms)
diff --git a/docs/content/docs/demos/form-builder.mdx b/docs/content/docs/demos/form-builder.mdx
index d61adf6..c1ea7b2 100644
--- a/docs/content/docs/demos/form-builder.mdx
+++ b/docs/content/docs/demos/form-builder.mdx
@@ -13,7 +13,4 @@ A standalone Next.js demo showcasing the `form-builder` plugin. Two sample forms
 - API Docs at `/api/data/reference` (OpenAPI Scalar)
 - Route Docs at `/pages/route-docs`
 
-<iframe
-  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/form-builder?embed=1&startScript=dev&file=lib%2Fstack.ts"
-  style={{ width: '100%', height: '700px', border: 0, borderRadius: '8px' }}
-/>
+[Open in CodeSandbox →](https://codesandbox.io/p/devbox/github/better-stack-ai/better-stack/tree/main/demos/form-builder)
diff --git a/docs/content/docs/demos/kanban.mdx b/docs/content/docs/demos/kanban.mdx
index f33d2ec..8302dfd 100644
--- a/docs/content/docs/demos/kanban.mdx
+++ b/docs/content/docs/demos/kanban.mdx
@@ -12,7 +12,4 @@ A standalone Next.js demo showcasing the `kanban` plugin. One demo board with 4
 - API Docs at `/api/data/reference` (OpenAPI Scalar)
 - Route Docs at `/pages/route-docs`
 
-<iframe
-  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/kanban?embed=1&startScript=dev&file=lib%2Fstack.ts"
-  style={{ width: '100%', height: '700px', border: 0, borderRadius: '8px' }}
-/>
+[Open in CodeSandbox →](https://codesandbox.io/p/devbox/github/better-stack-ai/better-stack/tree/main/demos/kanban)
diff --git a/docs/content/docs/demos/ui-builder.mdx b/docs/content/docs/demos/ui-builder.mdx
index 6128e37..e4f4d5b 100644
--- a/docs/content/docs/demos/ui-builder.mdx
+++ b/docs/content/docs/demos/ui-builder.mdx
@@ -12,7 +12,4 @@ A standalone Next.js demo showcasing the `ui-builder` plugin backed by the `cms`
 - API Docs at `/api/data/reference` (OpenAPI Scalar)
 - Route Docs at `/pages/route-docs`
 
-<iframe
-  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/ui-builder?embed=1&startScript=dev&file=lib%2Fstack.ts"
-  style={{ width: '100%', height: '700px', border: 0, borderRadius: '8px' }}
-/>
+[Open in CodeSandbox →](https://codesandbox.io/p/devbox/github/better-stack-ai/better-stack/tree/main/demos/ui-builder)