diff --git a/web/src/app/router.tsx b/web/src/app/router.tsx
index 6b693318..68b215e7 100644
--- a/web/src/app/router.tsx
+++ b/web/src/app/router.tsx
@@ -96,13 +96,13 @@ const searchRoute = createRoute({
 
 const namespaceRoute = createRoute({
   getParentRoute: () => rootRoute,
-  path: '/$namespace',
+  path: '/space/$namespace',
   component: NamespacePage,
 })
 
 const skillDetailRoute = createRoute({
   getParentRoute: () => rootRoute,
-  path: '/$namespace/$slug',
+  path: '/space/$namespace/$slug',
   component: SkillDetailPage,
 })
 
diff --git a/web/src/pages/dashboard/my-namespaces.tsx b/web/src/pages/dashboard/my-namespaces.tsx
index 78673ff3..fd0dc01a 100644
--- a/web/src/pages/dashboard/my-namespaces.tsx
+++ b/web/src/pages/dashboard/my-namespaces.tsx
@@ -10,7 +10,7 @@ export function MyNamespacesPage() {
   const { data: namespaces, isLoading } = useMyNamespaces()
 
   const handleNamespaceClick = (slug: string) => {
-    navigate({ to: `/@${slug}` })
+    navigate({ to: `/space/${slug}` })
   }
 
   const handleMembersClick = (slug: string, e: React.MouseEvent) => {
diff --git a/web/src/pages/dashboard/my-skills.tsx b/web/src/pages/dashboard/my-skills.tsx
index 19b8f3aa..dd567009 100644
--- a/web/src/pages/dashboard/my-skills.tsx
+++ b/web/src/pages/dashboard/my-skills.tsx
@@ -9,7 +9,7 @@ export function MySkillsPage() {
   const { data: skills, isLoading } = useMySkills()
 
   const handleSkillClick = (namespace: string, slug: string) => {
-    navigate({ to: `/@${namespace}/${slug}` })
+    navigate({ to: `/space/${namespace}/${slug}` })
   }
 
   if (isLoading) {
diff --git a/web/src/pages/dashboard/stars.tsx b/web/src/pages/dashboard/stars.tsx
index 58940158..9854e850 100644
--- a/web/src/pages/dashboard/stars.tsx
+++ b/web/src/pages/dashboard/stars.tsx
@@ -32,7 +32,7 @@ export function MyStarsPage() {
             <SkillCard
               key={skill.id}
               skill={skill}
-              onClick={() => navigate({ to: `/@${skill.namespace}/${skill.slug}` })}
+              onClick={() => navigate({ to: `/space/${skill.namespace}/${skill.slug}` })}
             />
           ))}
         </div>
diff --git a/web/src/pages/home.tsx b/web/src/pages/home.tsx
index 83bacfde..c42b7794 100644
--- a/web/src/pages/home.tsx
+++ b/web/src/pages/home.tsx
@@ -23,7 +23,7 @@ export function HomePage() {
   }
 
   const handleSkillClick = (namespace: string, slug: string) => {
-    navigate({ to: `/@${namespace}/${slug}` })
+    navigate({ to: `/space/${namespace}/${slug}` })
   }
 
   return (
diff --git a/web/src/pages/namespace.tsx b/web/src/pages/namespace.tsx
index e78e3957..e0929bf4 100644
--- a/web/src/pages/namespace.tsx
+++ b/web/src/pages/namespace.tsx
@@ -7,7 +7,7 @@ import { useNamespaceDetail, useSearchSkills } from '@/shared/hooks/use-skill-qu
 
 export function NamespacePage() {
   const navigate = useNavigate()
-  const { namespace } = useParams({ from: '/$namespace' })
+  const { namespace } = useParams({ from: '/space/$namespace' })
 
   const { data: namespaceData, isLoading: isLoadingNamespace } = useNamespaceDetail(namespace)
   const { data: skillsData, isLoading: isLoadingSkills } = useSearchSkills({
@@ -16,7 +16,7 @@ export function NamespacePage() {
   })
 
   const handleSkillClick = (slug: string) => {
-    navigate({ to: `/@${namespace}/${slug}` })
+    navigate({ to: `/space/${namespace}/${slug}` })
   }
 
   if (isLoadingNamespace) {
diff --git a/web/src/pages/search.tsx b/web/src/pages/search.tsx
index f0303baa..db8b29ab 100644
--- a/web/src/pages/search.tsx
+++ b/web/src/pages/search.tsx
@@ -35,7 +35,7 @@ export function SearchPage() {
   }
 
   const handleSkillClick = (namespace: string, slug: string) => {
-    navigate({ to: `/@${namespace}/${slug}` })
+    navigate({ to: `/space/${namespace}/${slug}` })
   }
 
   const totalPages = data ? Math.ceil(data.total / data.size) : 0
diff --git a/web/src/pages/skill-detail.tsx b/web/src/pages/skill-detail.tsx
index f1dbf032..714f1e25 100644
--- a/web/src/pages/skill-detail.tsx
+++ b/web/src/pages/skill-detail.tsx
@@ -22,7 +22,7 @@ export function SkillDetailPage() {
   const navigate = useNavigate()
   const location = useRouterState({ select: (s) => s.location })
   const queryClient = useQueryClient()
-  const { namespace, slug } = useParams({ from: '/$namespace/$slug' })
+  const { namespace, slug } = useParams({ from: '/space/$namespace/$slug' })
   const { user, hasRole } = useAuth()
 
   const { data: skill, isLoading: isLoadingSkill } = useSkillDetail(namespace, slug)