diff --git a/src/gateway/app.module.ts b/src/gateway/app.module.ts
index f8ccb625..03200ec5 100644
--- a/src/gateway/app.module.ts
+++ b/src/gateway/app.module.ts
@@ -13,8 +13,7 @@ const isDev = process.env.NODE_ENV !== "production";
   imports: [
     ServeStaticModule.forRoot({
       rootPath: join(__dirname, "public"),
-      serveRoot: "/",
-      exclude: ["/api/(.*)", "/ws/(.*)"],
+      serveRoot: "/client",
     }),
     LoggerModule.forRoot({
       pinoHttp: isDev
diff --git a/src/gateway/public/index.html b/src/gateway/public/index.html
index d4efa161..0cedd243 100644
--- a/src/gateway/public/index.html
+++ b/src/gateway/public/index.html
@@ -8,9 +8,9 @@
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
   <meta name="apple-mobile-web-app-title" content="Geneva">
-  <link rel="manifest" href="/manifest.json">
-  <link rel="icon" href="/icon.png" type="image/png">
-  <link rel="apple-touch-icon" href="/icon.png">
+  <link rel="manifest" href="manifest.json">
+  <link rel="icon" href="icon.png" type="image/png">
+  <link rel="apple-touch-icon" href="icon.png">
   <style>
     * { margin: 0; padding: 0; box-sizing: border-box; -webkit-tap-highlight-color: transparent; }
 
@@ -485,7 +485,7 @@
 
     // --- PWA: Register Service Worker ---
     if ('serviceWorker' in navigator) {
-      navigator.serviceWorker.register('/sw.js').catch(() => {});
+      navigator.serviceWorker.register('sw.js', { scope: '/client/' }).catch(() => {});
     }
   </script>
 </body>
diff --git a/src/gateway/public/manifest.json b/src/gateway/public/manifest.json
index 1d720717..25dd5cf9 100644
--- a/src/gateway/public/manifest.json
+++ b/src/gateway/public/manifest.json
@@ -2,14 +2,15 @@
   "name": "Geneva Client",
   "short_name": "Geneva",
   "description": "Mobile client for Geneva Gateway",
-  "start_url": "/",
+  "start_url": "/client/",
+  "scope": "/client/",
   "display": "standalone",
   "orientation": "portrait",
   "theme_color": "#0f172a",
   "background_color": "#0f172a",
   "icons": [
     {
-      "src": "/icon.png",
+      "src": "/client/icon.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "any maskable"
diff --git a/src/gateway/public/sw.js b/src/gateway/public/sw.js
index dff22480..1f8bf99c 100644
--- a/src/gateway/public/sw.js
+++ b/src/gateway/public/sw.js
@@ -1,5 +1,5 @@
 const CACHE_NAME = "geneva-client-v1";
-const PRECACHE_URLS = ["/", "/icon.png"];
+const PRECACHE_URLS = ["/client/", "/client/icon.png"];
 
 self.addEventListener("install", (event) => {
   event.waitUntil(