diff --git a/packages/website/src/components/Header.tsx b/packages/website/src/components/Header.tsx
index ae5e8cc..cf8416d 100644
--- a/packages/website/src/components/Header.tsx
+++ b/packages/website/src/components/Header.tsx
@@ -22,7 +22,7 @@ export default function Header() {
 					<div className="flex items-center justify-between gap-2">
 						{/* Logo */}
 						<Link
-							href="/"
+							href="~/"
 							className="flex items-center gap-2 sm:gap-3 group shrink-0"
 							aria-label={t('header.logo_alt')}
 							onClick={() => setMobileMenuOpen(false)}
diff --git a/packages/website/src/pages/docs/Layout.tsx b/packages/website/src/pages/docs/Layout.tsx
index 5322d49..25838f9 100644
--- a/packages/website/src/pages/docs/Layout.tsx
+++ b/packages/website/src/pages/docs/Layout.tsx
@@ -24,31 +24,31 @@ export default function DocsLayout({ children }: DocsLayoutProps) {
 		{
 			title: t('nav.introduction'),
 			items: [
-				{ title: t('nav.overview'), path: '/docs/introduction/overview' },
-				{ title: t('nav.quick_start'), path: '/docs/introduction/quick-start' },
-				{ title: t('nav.limitations'), path: '/docs/introduction/limitations' },
+				{ title: t('nav.overview'), path: '/introduction/overview' },
+				{ title: t('nav.quick_start'), path: '/introduction/quick-start' },
+				{ title: t('nav.limitations'), path: '/introduction/limitations' },
 			],
 		},
 		{
 			title: t('nav.features'),
 			items: [
-				{ title: t('nav.models'), path: '/docs/features/models' },
-				{ title: t('nav.custom_tools'), path: '/docs/features/custom-tools' },
-				{ title: t('nav.knowledge_injection'), path: '/docs/features/custom-instructions' },
-				{ title: t('nav.data_masking'), path: '/docs/features/data-masking' },
+				{ title: t('nav.models'), path: '/features/models' },
+				{ title: t('nav.custom_tools'), path: '/features/custom-tools' },
+				{ title: t('nav.knowledge_injection'), path: '/features/custom-instructions' },
+				{ title: t('nav.data_masking'), path: '/features/data-masking' },
 			],
 		},
 		{
 			title: t('nav.integration'),
 			items: [
-				{ title: t('nav.configuration'), path: '/docs/integration/configuration' },
-				{ title: t('nav.third_party_agent'), path: '/docs/integration/third-party-agent' },
-				{ title: t('nav.cdn_setup'), path: '/docs/integration/cdn-setup' },
+				{ title: t('nav.configuration'), path: '/integration/configuration' },
+				{ title: t('nav.third_party_agent'), path: '/integration/third-party-agent' },
+				{ title: t('nav.cdn_setup'), path: '/integration/cdn-setup' },
 				{
 					title: '🚧 ' + t('nav.security_permissions'),
-					path: '/docs/integration/security-permissions',
+					path: '/integration/security-permissions',
 				},
-				{ title: '🚧 ' + t('nav.best_practices'), path: '/docs/integration/best-practices' },
+				{ title: '🚧 ' + t('nav.best_practices'), path: '/integration/best-practices' },
 			],
 		},
 	]
diff --git a/packages/website/src/pages/docs/index.tsx b/packages/website/src/pages/docs/index.tsx
index 8ac145c..75e45e7 100644
--- a/packages/website/src/pages/docs/index.tsx
+++ b/packages/website/src/pages/docs/index.tsx
@@ -34,66 +34,66 @@ export default function DocsRouter() {
 	return (
 		<Switch>
 			{/* Introduction */}
-			<Route path="/docs/introduction/overview">
+			<Route path="/introduction/overview">
 				<DocsPage>
 					<Overview />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/introduction/quick-start">
+			<Route path="/introduction/quick-start">
 				<DocsPage>
 					<QuickStart />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/introduction/limitations">
+			<Route path="/introduction/limitations">
 				<DocsPage>
 					<Limitations />
 				</DocsPage>
 			</Route>
 
 			{/* Features */}
-			<Route path="/docs/features/custom-tools">
+			<Route path="/features/custom-tools">
 				<DocsPage>
 					<CustomTools />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/features/data-masking">
+			<Route path="/features/data-masking">
 				<DocsPage>
 					<DataMasking />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/features/custom-instructions">
+			<Route path="/features/custom-instructions">
 				<DocsPage>
 					<Instructions />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/features/models">
+			<Route path="/features/models">
 				<DocsPage>
 					<Models />
 				</DocsPage>
 			</Route>
 
 			{/* Integration */}
-			<Route path="/docs/integration/cdn-setup">
+			<Route path="/integration/cdn-setup">
 				<DocsPage>
 					<CdnSetup />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/integration/security-permissions">
+			<Route path="/integration/security-permissions">
 				<DocsPage>
 					<SecurityPermissions />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/integration/configuration">
+			<Route path="/integration/configuration">
 				<DocsPage>
 					<Configuration />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/integration/best-practices">
+			<Route path="/integration/best-practices">
 				<DocsPage>
 					<BestPractices />
 				</DocsPage>
 			</Route>
-			<Route path="/docs/integration/third-party-agent">
+			<Route path="/integration/third-party-agent">
 				<DocsPage>
 					<ThirdPartyAgent />
 				</DocsPage>
diff --git a/packages/website/src/router.tsx b/packages/website/src/router.tsx
index 543e4ab..8a40176 100644
--- a/packages/website/src/router.tsx
+++ b/packages/website/src/router.tsx
@@ -15,7 +15,7 @@ export default function Router() {
 				</Route>
 
 				{/* All docs pages */}
-				<Route path="/docs/:rest*">
+				<Route path="/docs" nest>
 					<DocsPages />
 				</Route>