diff --git a/src/App.tsx b/src/App.tsx
index 7e9b0ff..e826357 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,10 +12,10 @@ const App = () => (
     <TooltipProvider>
       <Toaster />
       <Sonner />
-      <BrowserRouter>
+      <BrowserRouter basename="/cv">
         <Routes>
-          <Route path="/cv/:lang" element={<Index />} />
-          <Route path="/" element={<Navigate to="/cv/sv" replace />} />
+          <Route path="/:lang" element={<Index />} />
+          <Route path="/" element={<Navigate to="/sv" replace />} />
         </Routes>
       </BrowserRouter>
     </TooltipProvider>
diff --git a/src/components/LanguageSelector.tsx b/src/components/LanguageSelector.tsx
index ff7a9cd..f96cd8f 100644
--- a/src/components/LanguageSelector.tsx
+++ b/src/components/LanguageSelector.tsx
@@ -8,7 +8,7 @@ export const LanguageSelector = () => {
 
   const handleLanguageChange = (lang: 'en' | 'sv') => {
     setLanguage(lang);
-    navigate(`/cv/${lang}`);
+    navigate(`/${lang}`);
   };
 
   return (