diff --git a/packages/presentation/src/connect.ts b/packages/presentation/src/connect.ts
index 7cd9d96b2c..529f6de038 100644
--- a/packages/presentation/src/connect.ts
+++ b/packages/presentation/src/connect.ts
@@ -1,7 +1,7 @@
 import client from '@hcengineering/client'
 import contact from '@hcengineering/contact'
 import core, { Client, setCurrentAccount, Version } from '@hcengineering/core'
-import login from '@hcengineering/login'
+import login, { loginId } from '@hcengineering/login'
 import { getMetadata, getResource, setMetadata } from '@hcengineering/platform'
 import { fetchMetadataLocalStorage, getCurrentLocation, navigate, setMetadataLocalStorage } from '@hcengineering/ui'
 import presentation from './plugin'
@@ -11,6 +11,7 @@ export let versionError: string | undefined = ''
 export async function connect (title: string): Promise<Client | undefined> {
   const loc = getCurrentLocation()
   const ws = loc.path[1]
+  if (ws === undefined) return
   const tokens: Record<string, string> = fetchMetadataLocalStorage(login.metadata.LoginTokens) ?? {}
   const token = tokens[ws]
   setMetadata(login.metadata.LoginToken, token)
@@ -19,7 +20,7 @@ export async function connect (title: string): Promise<Client | undefined> {
 
   if (token === undefined || endpoint === null || email === null) {
     navigate({
-      path: [login.component.LoginApp],
+      path: [loginId],
       query: { navigateUrl: encodeURIComponent(JSON.stringify(loc)) }
     })
     return
@@ -35,7 +36,7 @@ export async function connect (title: string): Promise<Client | undefined> {
     () => {
       clearMetadata(ws)
       navigate({
-        path: [login.component.LoginApp],
+        path: [loginId],
         query: {}
       })
     }
@@ -50,7 +51,7 @@ export async function connect (title: string): Promise<Client | undefined> {
     console.error('WARNING: no employee account found.')
     clearMetadata(ws)
     navigate({
-      path: [login.component.LoginApp],
+      path: [loginId],
       query: { navigateUrl: encodeURIComponent(JSON.stringify(getCurrentLocation())) }
     })
     return
diff --git a/plugins/client-resources/src/index.ts b/plugins/client-resources/src/index.ts
index 3723df5148..204540deef 100644
--- a/plugins/client-resources/src/index.ts
+++ b/plugins/client-resources/src/index.ts
@@ -41,9 +41,9 @@ export default async () => {
       ): Promise<Client> => {
         if (client instanceof Promise) {
           client = await client
-          await client.close()
         }
         if (token !== _token && client !== undefined) {
+          await client.close()
           client = undefined
         }
         if (client === undefined) {
diff --git a/plugins/login-resources/src/components/InviteLink.svelte b/plugins/login-resources/src/components/InviteLink.svelte
index a4ca31cce5..f4fc4070b4 100644
--- a/plugins/login-resources/src/components/InviteLink.svelte
+++ b/plugins/login-resources/src/components/InviteLink.svelte
@@ -20,13 +20,14 @@
   import { createEventDispatcher } from 'svelte'
   import login from '../plugin'
   import InviteWorkspace from './icons/InviteWorkspace.svelte'
+  import { loginId } from '@hcengineering/login'
 
   const dispatch = createEventDispatcher()
 
   async function getLink (): Promise<string> {
     const inviteId = await getInviteLink()
     const loc = getCurrentLocation()
-    loc.path[0] = login.component.LoginApp
+    loc.path[0] = loginId
     loc.path[1] = 'join'
     loc.path.length = 2
     loc.query = {
diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte
index 2b5ccc84ec..87e7984370 100644
--- a/plugins/setting-resources/src/components/Settings.svelte
+++ b/plugins/setting-resources/src/components/Settings.svelte
@@ -27,7 +27,7 @@
   } from '@hcengineering/ui'
   import { onDestroy } from 'svelte'
   import CategoryElement from './CategoryElement.svelte'
-  import login from '@hcengineering/login'
+  import login, { loginId } from '@hcengineering/login'
   import { AccountRole, getCurrentAccount } from '@hcengineering/core'
   import { EmployeeAccount } from '@hcengineering/contact'
   import { setMetadata } from '@hcengineering/platform'
@@ -76,10 +76,10 @@
     setMetadata(login.metadata.LoginToken, null)
     setMetadataLocalStorage(login.metadata.LoginEndpoint, null)
     setMetadataLocalStorage(login.metadata.LoginEmail, null)
-    navigate({ path: [login.component.LoginApp] })
+    navigate({ path: [loginId] })
   }
   function selectWorkspace (): void {
-    navigate({ path: [login.component.LoginApp, 'selectWorkspace'] })
+    navigate({ path: [loginId, 'selectWorkspace'] })
   }
   function inviteWorkspace (): void {
     showPopup(login.component.InviteLink, {})
diff --git a/plugins/tracker-resources/src/components/AccountPopup.svelte b/plugins/tracker-resources/src/components/AccountPopup.svelte
index e6fe808fa1..ae8cffa496 100644
--- a/plugins/tracker-resources/src/components/AccountPopup.svelte
+++ b/plugins/tracker-resources/src/components/AccountPopup.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import contact, { Employee, EmployeeAccount, formatName } from '@hcengineering/contact'
   import { getCurrentAccount } from '@hcengineering/core'
-  import login from '@hcengineering/login'
+  import login, { loginId } from '@hcengineering/login'
   import { setMetadata } from '@hcengineering/platform'
   import { Avatar, createQuery } from '@hcengineering/presentation'
   import setting, { settingId, SettingsCategory } from '@hcengineering/setting'
@@ -68,11 +68,11 @@
     setMetadata(login.metadata.LoginToken, null)
     setMetadataLocalStorage(login.metadata.LoginEndpoint, null)
     setMetadataLocalStorage(login.metadata.LoginEmail, null)
-    navigate({ path: [login.component.LoginApp] })
+    navigate({ path: [loginId] })
   }
 
   function selectWorkspace (): void {
-    navigate({ path: [login.component.LoginApp, 'selectWorkspace'] })
+    navigate({ path: [loginId, 'selectWorkspace'] })
   }
 
   function filterItems (items: SettingsCategory[]): SettingsCategory[] {
diff --git a/plugins/workbench-resources/src/components/AccountPopup.svelte b/plugins/workbench-resources/src/components/AccountPopup.svelte
index 575960ab71..b81af35cfd 100644
--- a/plugins/workbench-resources/src/components/AccountPopup.svelte
+++ b/plugins/workbench-resources/src/components/AccountPopup.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import contact, { Employee, EmployeeAccount, formatName } from '@hcengineering/contact'
   import { AccountRole, getCurrentAccount } from '@hcengineering/core'
-  import login from '@hcengineering/login'
+  import login, { loginId } from '@hcengineering/login'
   import { setMetadata } from '@hcengineering/platform'
   import { Avatar, createQuery } from '@hcengineering/presentation'
   import setting, { settingId, SettingsCategory } from '@hcengineering/setting'
@@ -82,7 +82,7 @@
     setMetadata(login.metadata.LoginToken, null)
     setMetadataLocalStorage(login.metadata.LoginEndpoint, null)
     setMetadataLocalStorage(login.metadata.LoginEmail, null)
-    navigate({ path: [login.component.LoginApp] })
+    navigate({ path: [loginId] })
   }
 
   function inviteWorkspace (): void {
diff --git a/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte b/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
index 336f8d425d..0edbdc3c70 100644
--- a/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
+++ b/plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import login from '@hcengineering/login'
+  import login, { loginId } from '@hcengineering/login'
   import {
     getWorkspaces,
     navigateToWorkspace,
@@ -83,7 +83,7 @@
     {
       label: getEmbeddedLabel('...'),
       action: async () => {
-        navigate({ path: [login.component.LoginApp, 'selectWorkspace'] })
+        navigate({ path: [loginId, 'selectWorkspace'] })
       },
       isSubmenuRightClicking: false
     }
diff --git a/plugins/workbench-resources/src/components/WorkbenchApp.svelte b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
index 85e2d8a4e2..9700990575 100644
--- a/plugins/workbench-resources/src/components/WorkbenchApp.svelte
+++ b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
@@ -19,26 +19,29 @@
 
   import Workbench from './Workbench.svelte'
   import workbench from '../plugin'
+  import { workbenchId } from '@hcengineering/workbench'
 </script>
 
-{#key $location.path[1]}
-  {#await connect(getMetadata(workbench.metadata.PlatformTitle) ?? 'Platform')}
-    <Loading />
-  {:then client}
-    {#if !client && versionError}
-      <div class="antiPopup version-popup">
-        <h1>Server is under maintenance.</h1>
-        {versionError}
-      </div>
-    {:else if client}
-      <Notifications>
-        <Workbench {client} />
-      </Notifications>
-    {/if}
-  {:catch error}
-    <div>{error} -- {error.stack}</div>
-  {/await}
-{/key}
+{#if $location.path[0] === workbenchId || $location.path[0] === workbench.component.WorkbenchApp}
+  {#key $location.path[1]}
+    {#await connect(getMetadata(workbench.metadata.PlatformTitle) ?? 'Platform')}
+      <Loading />
+    {:then client}
+      {#if !client && versionError}
+        <div class="antiPopup version-popup">
+          <h1>Server is under maintenance.</h1>
+          {versionError}
+        </div>
+      {:else if client}
+        <Notifications>
+          <Workbench {client} />
+        </Notifications>
+      {/if}
+    {:catch error}
+      <div>{error} -- {error.stack}</div>
+    {/await}
+  {/key}
+{/if}
 
 <style lang="scss">
   .version-popup {
diff --git a/tests/sanity/package.json b/tests/sanity/package.json
index 858ae52b8e..5351fb79c6 100644
--- a/tests/sanity/package.json
+++ b/tests/sanity/package.json
@@ -16,8 +16,8 @@
     "dev-uitest": "cross-env PLATFORM_URI=http://localhost:8080 PLATFORM_TRANSACTOR=ws://localhost:3333 SETTING=storage-dev.json playwright test --browser chromium --reporter list,html -c ./tests/playwright.config.ts",
     "debug": "playwright test --browser chromium -c ./tests/playwright.config.ts --debug --headed",
     "dev-debug": "cross-env PLATFORM_URI=http://localhost:8080 PLATFORM_TRANSACTOR=ws://localhost:3333 SETTING=storage-dev.json playwright test --browser chromium -c ./tests/playwright.config.ts --debug --headed",
-    "codegen": "playwright codegen --load-storage storage.json http://localhost:8083/workbench%3Acomponent%3AWorkbenchApp",
-    "dev-codegen": "cross-env playwright codegen --load-storage storage-dev.json http://localhost:8080/workbench%3Acomponent%3AWorkbenchApp"
+    "codegen": "playwright codegen --load-storage storage.json http://localhost:8083/workbench",
+    "dev-codegen": "cross-env playwright codegen --load-storage storage-dev.json http://localhost:8080/workbench"
   },
   "devDependencies": {
     "@hcengineering/platform-rig": "^0.6.0",
diff --git a/tests/sanity/tests/actions.spec.ts b/tests/sanity/tests/actions.spec.ts
index f9490553f8..e58b2d5193 100644
--- a/tests/sanity/tests/actions.spec.ts
+++ b/tests/sanity/tests/actions.spec.ts
@@ -8,13 +8,13 @@ test.use({
 test.describe('actions tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws/sanity-ws`)
   })
   test('action-new-candidate', async ({ page }) => {
     await page.click('[id="app-recruit\\:string\\:RecruitApplication"]')
 
     await page.click('text=Talents')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/talents`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/talents`)
 
     await page.click('td:has-text("Frontend Engineer")')
 
@@ -29,26 +29,26 @@ test.describe('actions tests', () => {
     await page.click('[id="app-recruit\\:string\\:RecruitApplication"]')
 
     await page.click('text=Talents')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/talents`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/talents`)
 
     await page.press('body', 'Meta+k')
     await page.fill('[placeholder="type\\ to\\ filter\\.\\.\\."]', 'go to')
     expect(await page.locator('div.selectPopup :text("Go To Vacancies")').count()).toBe(1)
     await page.click('div.selectPopup :text("Go To Vacancies")')
 
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/vacancies`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/vacancies`)
   })
   test('action-switch-applications', async ({ page }) => {
     await page.click('[id="app-recruit\\:string\\:RecruitApplication"]')
 
     await page.click('text=Talents')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/talents`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/talents`)
 
     await page.press('body', 'Meta+k')
     await page.fill('[placeholder="type\\ to\\ filter\\.\\.\\."]', 'go to')
     expect(await page.locator('div.selectPopup :text("Go To Applications")').count()).toBe(1)
     await page.click('div.selectPopup :text("Go To Applications")')
 
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/candidates`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/candidates`)
   })
 })
diff --git a/tests/sanity/tests/contact.duplicate.spec.ts b/tests/sanity/tests/contact.duplicate.spec.ts
index 6f140bf3a9..4ca2da7a21 100644
--- a/tests/sanity/tests/contact.duplicate.spec.ts
+++ b/tests/sanity/tests/contact.duplicate.spec.ts
@@ -8,7 +8,7 @@ test.use({
 test.describe('duplicate-org-test', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
   test('check-contact-exists', async ({ page }) => {
     await page.click('[id="app-lead\\:string\\:LeadApplication"]')
diff --git a/tests/sanity/tests/contacts.spec.ts b/tests/sanity/tests/contacts.spec.ts
index 7195fe66e0..58feec2bd0 100644
--- a/tests/sanity/tests/contacts.spec.ts
+++ b/tests/sanity/tests/contacts.spec.ts
@@ -8,7 +8,7 @@ test.use({
 test.describe('contact tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
   test('create-contact', async ({ page }) => {
     // Create a new context with the saved storage state.
diff --git a/tests/sanity/tests/login.spec.ts b/tests/sanity/tests/login.spec.ts
index 2cb192efd2..0e214afdb4 100644
--- a/tests/sanity/tests/login.spec.ts
+++ b/tests/sanity/tests/login.spec.ts
@@ -9,7 +9,7 @@ test.describe('login test', () => {
     })
 
     // Create user and workspace
-    await page.goto(`${PlatformURI}/login%3Acomponent%3ALoginApp/login`)
+    await page.goto(`${PlatformURI}/login/login`)
 
     const emaillocator = page.locator('[name=email]')
     await emaillocator.click()
diff --git a/tests/sanity/tests/org.members.spec.ts b/tests/sanity/tests/org.members.spec.ts
index 272986c84a..30b509350d 100644
--- a/tests/sanity/tests/org.members.spec.ts
+++ b/tests/sanity/tests/org.members.spec.ts
@@ -8,7 +8,7 @@ test.use({
 test.describe('recruit tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
 
   test('org-add-member', async ({ page }) => {
diff --git a/tests/sanity/tests/recruit.review.spec.ts b/tests/sanity/tests/recruit.review.spec.ts
index 407b03acc3..5e79dfc0af 100644
--- a/tests/sanity/tests/recruit.review.spec.ts
+++ b/tests/sanity/tests/recruit.review.spec.ts
@@ -8,7 +8,7 @@ test.use({
 test.describe('recruit review tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
   test('create-review', async ({ page, context }) => {
     await page.click('[id="app-recruit\\:string\\:RecruitApplication"]')
diff --git a/tests/sanity/tests/recruit.spec.ts b/tests/sanity/tests/recruit.spec.ts
index 48059103aa..c25397df5e 100644
--- a/tests/sanity/tests/recruit.spec.ts
+++ b/tests/sanity/tests/recruit.spec.ts
@@ -8,7 +8,7 @@ test.use({
 test.describe('recruit tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await (await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`))?.finished()
+    await (await page.goto(`${PlatformURI}/workbench/sanity-ws`))?.finished()
   })
   test('create-candidate', async ({ page, context }) => {
     await page.locator('[id="app-recruit\\:string\\:RecruitApplication"]').click()
diff --git a/tests/sanity/tests/settings.spec.ts b/tests/sanity/tests/settings.spec.ts
index 89d2f09bc7..6330a52f79 100644
--- a/tests/sanity/tests/settings.spec.ts
+++ b/tests/sanity/tests/settings.spec.ts
@@ -7,18 +7,18 @@ test.use({
 test.describe('contact tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
   test('update-profile', async ({ page, context }) => {
-    // Go to http://localhost:8083/workbench%3Acomponent%3AWorkbenchApp/sanity-ws
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    // Go to http://localhost:8083/workbench/sanity-ws
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
     // Click #profile-button
     await page.click('#profile-button')
     await page.click('text=Appleseed John')
-    // await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/setting/setting`)
+    // await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/setting/setting`)
     // Click text=Edit profile
     // await page.click('text=Edit profile')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/setting/profile`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/setting/profile`)
     // Click [placeholder="Location"]
     await page.click('[placeholder="Location"]')
     // Fill [placeholder="Location"]
@@ -37,8 +37,8 @@ test.describe('contact tests', () => {
     await page.click('.editor-container button:nth-child(3)')
   })
   test('create-template', async ({ page }) => {
-    // Go to http://localhost:8083/workbench%3Acomponent%3AWorkbenchApp/sanity-ws
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    // Go to http://localhost:8083/workbench/sanity-ws
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
     // Click #profile-button
     await page.click('#profile-button')
     // Click button:has-text("Settings")
@@ -70,8 +70,8 @@ test.describe('contact tests', () => {
   })
 
   test('manage-templates', async ({ page }) => {
-    // Go to http://localhost:8083/workbench%3Acomponent%3AWorkbenchApp/sanity-ws
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    // Go to http://localhost:8083/workbench/sanity-ws
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
     // Click #profile-button
     await page.click('#profile-button')
     // await page.click('text=Workspace')
diff --git a/tests/sanity/tests/tags.spec.ts b/tests/sanity/tests/tags.spec.ts
index d202ccea98..89005e5e80 100644
--- a/tests/sanity/tests/tags.spec.ts
+++ b/tests/sanity/tests/tags.spec.ts
@@ -8,17 +8,17 @@ test.use({
 test.describe('recruit tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
   test('create-candidate-with-skill', async ({ page }) => {
-    // Go to http://localhost:8083/workbench%3Acomponent%3AWorkbenchApp/sanity-ws
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    // Go to http://localhost:8083/workbench/sanity-ws
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
     // Click [id="app-recruit\:string\:RecruitApplication"]
     await page.click('[id="app-recruit\\:string\\:RecruitApplication"]')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit`)
     // Click text=Talents
     await page.click('text=Talents')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/talents`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/talents`)
     // Click button:has-text("Talent")
     await page.click('button:has-text("Talent")')
     // Fill [placeholder="John"]
@@ -50,14 +50,14 @@ test.describe('recruit tests', () => {
   })
 
   test('create-tag-candidate', async ({ page }) => {
-    // Go to http://localhost:8083/workbench%3Acomponent%3AWorkbenchApp/sanity-ws
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    // Go to http://localhost:8083/workbench/sanity-ws
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
     // Click [id="app-recruit\:string\:RecruitApplication"]
     await page.click('[id="app-recruit\\:string\\:RecruitApplication"]')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit`)
     // Click text=Skills
     await page.click('text=Skills')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/skills`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/skills`)
     // Click button:has-text("Skill")
     await page.click('button:has-text("Skill")')
     // Click [placeholder="Please\ type\ skill\ title"]
@@ -81,7 +81,7 @@ test.describe('recruit tests', () => {
     await page.waitForSelector('form.antiCard', { state: 'detached' })
     // Click text=Talents
     await page.click('text=Talents')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/talents`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/talents`)
     // Click button:has-text("Talent")
     await page.click('button:has-text("Talent")')
     // Click #add-tag div div
diff --git a/tests/sanity/tests/tracker.projects.spec.ts b/tests/sanity/tests/tracker.projects.spec.ts
index 34ecd87048..c8435bf2be 100644
--- a/tests/sanity/tests/tracker.projects.spec.ts
+++ b/tests/sanity/tests/tracker.projects.spec.ts
@@ -9,7 +9,7 @@ test.use({
 test.describe('project tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
   test('create-project-issue', async ({ page }) => {
     await page.click('[id="app-tracker\\:string\\:TrackerApplication"]')
@@ -17,9 +17,7 @@ test.describe('project tests', () => {
     await navigate(page)
     // Click text=Projects
     await page.click('text=Projects')
-    await expect(page).toHaveURL(
-      `${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/projects`
-    )
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/projects`)
     await page.click('button:has-text("Project")')
     await page.click('[placeholder="Project\\ name"]')
     const prjId = 'project-' + generateId()
@@ -41,9 +39,7 @@ test.describe('project tests', () => {
   test('create-project-with-status', async ({ page }) => {
     await page.click('[id="app-tracker\\:string\\:TrackerApplication"]')
     await page.click('text=Projects')
-    await expect(page).toHaveURL(
-      `${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/projects`
-    )
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/projects`)
     await page.click('button:has-text("Project")')
     const prjId = 'project-' + generateId()
     await page.fill('[placeholder="Project\\ name"]', prjId)
diff --git a/tests/sanity/tests/tracker.utils.ts b/tests/sanity/tests/tracker.utils.ts
index 8c13af90f6..b89ca65e5d 100644
--- a/tests/sanity/tests/tracker.utils.ts
+++ b/tests/sanity/tests/tracker.utils.ts
@@ -22,9 +22,9 @@ export const DEFAULT_STATUSES = ['Backlog', 'Todo', 'In Progress', 'Done', 'Canc
 export const DEFAULT_USER = 'Appleseed John'
 
 export async function navigate (page: Page): Promise<void> {
-  await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+  await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   await page.click('[id="app-tracker\\:string\\:TrackerApplication"]')
-  await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/tracker`)
+  await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/tracker`)
 }
 
 export async function setViewGroup (page: Page, groupName: string): Promise<void> {
@@ -90,9 +90,7 @@ export async function createIssue (page: Page, props: IssueProps): Promise<void>
 
 export async function createProject (page: Page, projectName: string): Promise<void> {
   await page.click('text=Projects')
-  await expect(page).toHaveURL(
-    `${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/projects`
-  )
+  await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/projects`)
   await page.click('button:has-text("Project")')
   await page.click('[placeholder="Project\\ name"]')
   await page.fill('[placeholder="Project\\ name"]', projectName)
@@ -101,9 +99,7 @@ export async function createProject (page: Page, projectName: string): Promise<v
 
 export async function createSprint (page: Page, sprintName: string): Promise<void> {
   await page.click('text=Sprints')
-  await expect(page).toHaveURL(
-    `${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/sprints`
-  )
+  await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/tracker/tracker%3Ateam%3ADefaultTeam/sprints`)
   await page.click('button:has-text("Sprint")')
   await page.click('[placeholder="Sprint\\ name"]')
   await page.fill('[placeholder="Sprint\\ name"]', sprintName)
diff --git a/tests/sanity/tests/workbench.spec.ts b/tests/sanity/tests/workbench.spec.ts
index 7bd5493cc3..0d3d99c384 100644
--- a/tests/sanity/tests/workbench.spec.ts
+++ b/tests/sanity/tests/workbench.spec.ts
@@ -7,28 +7,28 @@ test.use({
 test.describe('workbench tests', () => {
   test.beforeEach(async ({ page }) => {
     // Create user and workspace
-    await page.goto(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws`)
+    await page.goto(`${PlatformURI}/workbench/sanity-ws`)
   })
   test('navigator', async ({ page }) => {
     // Click [id="app-recruit\:string\:RecruitApplication"]
     await page.click('[id="app-recruit\\:string\\:RecruitApplication"]')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit`)
     // Click text=Applications
     await page.click('text=Applications')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/candidates`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/candidates`)
     // Click text=Applications Application >> span
     await expect(page.locator('text=Applications Filter')).toBeVisible()
     await expect(page.locator('text="APP-1')).toBeDefined()
 
     // Click text=Talents
     await page.click('text=Talents')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/talents`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/talents`)
 
     await expect(page.locator('text=P. Andrey')).toBeVisible()
 
     // Click text=Vacancies
     await page.click('text=Vacancies')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/recruit/vacancies`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/recruit/vacancies`)
     // Click text=Software Engineer
     await page.click('text=Software Engineer')
     await expect(page.locator('text=Software Engineer')).toBeVisible()
@@ -38,7 +38,7 @@ test.describe('workbench tests', () => {
 
     // Click [id="app-chunter\:string\:ApplicationLabelChunter"]
     await page.click('[id="app-chunter\\:string\\:ApplicationLabelChunter"]')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/chunter`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/chunter`)
 
     await page.click('text=general')
 
@@ -46,7 +46,7 @@ test.describe('workbench tests', () => {
     await expect(page.locator('.textInput')).toBeVisible()
 
     await page.click('[id="app-contact\\:string\\:Contacts"]')
-    await expect(page).toHaveURL(`${PlatformURI}/workbench%3Acomponent%3AWorkbenchApp/sanity-ws/contact`)
+    await expect(page).toHaveURL(`${PlatformURI}/workbench/sanity-ws/contact`)
     // Click text=John Appleseed
     await expect(page.locator('text=Appleseed John')).toBeVisible()
   })