diff --git a/.env.example b/.env.example
index 2c3b413d..a73077ca 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,4 @@
 VITE_APP_BASE_URL=http://localhost:8080/Olog
 VITE_APP_WEBSOCKET_BASE_URL=ws://localhost:8080/Olog/web-socket
 VITE_APP_SUPPORT_HREF=https://jira.ess.eu/projects/CSSTUDIO
+VITE_APP_ENDPOINT=/webolog
diff --git a/.env.production b/.env.production
index 726df476..9733d28e 100644
--- a/.env.production
+++ b/.env.production
@@ -1,3 +1,4 @@
 VITE_APP_BASE_URL=VITE_APP_BASE_URL
 VITE_APP_WEBSOCKET_BASE_URL=VITE_APP_WEBSOCKET_BASE_URL
 VITE_APP_SUPPORT_HREF=VITE_APP_SUPPORT_HREF
+VITE_APP_ENDPOINT=VITE_APP_ENDPOINT
diff --git a/src/providers/RouterProvider.jsx b/src/providers/RouterProvider.jsx
index 1e6a88ca..9a49e0db 100644
--- a/src/providers/RouterProvider.jsx
+++ b/src/providers/RouterProvider.jsx
@@ -53,14 +53,14 @@ export const routes = [
         element: <HelpView />
       },
       {
-        path: "/*",
+        path: "*",
         element: <NotFoundView homeHref="/" />
       }
     ]
   }
 ];
 
-const router = createBrowserRouter(routes);
+const router = createBrowserRouter(routes, {basename: import.meta.env.BASE_URL});
 
 const RouterProvider = () => {
   return <ReactRouterDomRouterProvider router={router} />;
diff --git a/vite.config.ts b/vite.config.ts
index f946a779..c9e69185 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,41 +1,45 @@
-import { defineConfig } from "vitest/config";
+import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react-swc";
 import svgr from "vite-plugin-svgr";
 
 // https://vitejs.dev/config/
-export default defineConfig({
-  base: "/",
-  server: {
-    port: 3000,
-    open: true
-  },
-  build: {
-    outDir: "build",
-    emptyOutDir: true
-  },
-  plugins: [svgr(), react()],
-  resolve: {
-    alias: {
-      src: "/src",
-      config: "/src/config",
-      components: "/src/components",
-      views: "/src/views",
-      hooks: "/src/hooks",
-      providers: "/src/providers",
-      features: "/src/features",
-      api: "/src/api",
-      lib: "/src/lib",
-      mocks: "/src/mocks",
-      stories: "/src/stories",
-      "test-utils": "/src/test-utils"
-    }
-  },
-  test: {
-    setupFiles: "./src/setupTests.ts",
-    environment: "jsdom",
-    coverage: {
-      reporter: ["lcov", "text"]
+export default defineConfig(({ command, mode }) => {
+    const env = loadEnv(mode, process.cwd(), '')
+
+  return {
+    base: env.VITE_APP_ENDPOINT,
+    server: {
+      port: 3000,
+      open: true
+    },
+    build: {
+      outDir: "build",
+      emptyOutDir: true
     },
-    outputFile: "coverage/sonar-report.xml"
-  }
-});
+    plugins: [svgr(), react()],
+    resolve: {
+      alias: {
+        src: "/src",
+        config: "/src/config",
+        components: "/src/components",
+        views: "/src/views",
+        hooks: "/src/hooks",
+        providers: "/src/providers",
+        features: "/src/features",
+        api: "/src/api",
+        lib: "/src/lib",
+        mocks: "/src/mocks",
+        stories: "/src/stories",
+        "test-utils": "/src/test-utils"
+      }
+    },
+    test: {
+      setupFiles: "./src/setupTests.ts",
+      environment: "jsdom",
+      coverage: {
+        reporter: ["lcov", "text"]
+      },
+      outputFile: "coverage/sonar-report.xml"
+    }
+  };
+})