diff --git a/package.json b/package.json
index d099b4b89..2d78a5fa6 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "dev": "DISABLE_ESLINT_PLUGIN=true TSC_COMPILE_ON_ERROR=true REACT_APP_BACKEND=http://localhost:8765 REACT_APP_META_BACKEND=undefined npm start",
     "build": "rm -rf build && DISABLE_ESLINT_PLUGIN=true CI=true react-app-rewired build",
     "//build:embedded": "echo 'PUBLIC_URL is a setting for create-react-app. Embedded version is built and hosted as is on ydb servers, with no way of knowing the final URL pattern. PUBLIC_URL=. keeps paths to all static relative, allowing servers to handle them as needed'",
-    "build:embedded": "GENERATE_SOURCEMAP=false PUBLIC_URL=. REACT_APP_BACKEND=http://localhost:8765 REACT_APP_META_BACKEND=undefined npm run build",
+    "build:embedded": "GENERATE_SOURCEMAP=false PUBLIC_URL=. REACT_APP_BACKEND=undefined REACT_APP_META_BACKEND= npm run build",
     "build:embedded:archive": "npm run build:embedded && mv build embedded-ui && zip -r embedded-ui.zip embedded-ui && rm -rf embedded-ui",
     "lint": "run-p lint:*",
     "lint:js": "eslint  --ext .js,.jsx,.ts,.tsx .",
diff --git a/src/components/TenantNameWrapper/TenantNameWrapper.tsx b/src/components/TenantNameWrapper/TenantNameWrapper.tsx
index e05f4236a..3f44970f8 100644
--- a/src/components/TenantNameWrapper/TenantNameWrapper.tsx
+++ b/src/components/TenantNameWrapper/TenantNameWrapper.tsx
@@ -66,10 +66,13 @@ export function TenantNameWrapper({tenant, additionalTenantsProps}: TenantNameWr
                 withLeftTrim={true}
                 status={tenant.Overall}
                 hasClipboardButton
-                path={getTenantPath({
-                    database: tenant.Name,
-                    backend,
-                })}
+                path={
+                    '/ui' +
+                    getTenantPath({
+                        database: tenant.Name,
+                        backend,
+                    })
+                }
             />
         </CellWithPopover>
     );
diff --git a/src/containers/Clusters/columns.tsx b/src/containers/Clusters/columns.tsx
index 34e7a5b32..9accb5da9 100644
--- a/src/containers/Clusters/columns.tsx
+++ b/src/containers/Clusters/columns.tsx
@@ -34,7 +34,7 @@ export const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
             const clusterPath =
                 useEmbeddedUi && backend
                     ? createDeveloperUIMonitoringPageHref(backend)
-                    : getClusterPath(undefined, {backend, clusterName});
+                    : '/ui' + getClusterPath(undefined, {backend, clusterName});
 
             const clusterStatus = row.cluster?.Overall;
 
diff --git a/src/store/configureStore.ts b/src/store/configureStore.ts
index ee45dfec3..2fe1ee3bb 100644
--- a/src/store/configureStore.ts
+++ b/src/store/configureStore.ts
@@ -43,7 +43,7 @@ function _configureStore<
     return store;
 }
 
-export const webVersion = window.web_version;
+export const webVersion = true;
 export const customBackend = window.custom_backend;
 export const metaBackend = window.meta_backend;
 export const codeAssistBackend = window.code_assist_backend;
diff --git a/src/store/getUrlData.ts b/src/store/getUrlData.ts
index a9573ac6f..b5bd9d482 100644
--- a/src/store/getUrlData.ts
+++ b/src/store/getUrlData.ts
@@ -12,7 +12,7 @@ export const getUrlData = ({
         const backend = urlSearchParams.get('backend') ?? undefined;
         const clusterName = urlSearchParams.get('clusterName') ?? undefined;
         return {
-            basename: '/',
+            basename: 'ui',
             backend,
             clusterName,
         };