diff --git a/frontend/src/hooks.ts b/frontend/src/hooks.ts
index d473ce744b14a..15c8e2b6f3541 100644
--- a/frontend/src/hooks.ts
+++ b/frontend/src/hooks.ts
@@ -1,3 +1,5 @@
+import type { Reroute } from '@sveltejs/kit'
+
 /** @type {import('@sveltejs/kit').Handle} */
 export async function handle({ event, resolve }) {
 	const response = await resolve(event, {
@@ -6,3 +8,11 @@ export async function handle({ event, resolve }) {
 
 	return response
 }
+
+export const reroute: Reroute = ({ url }) => {
+	const match = url.pathname.match(/^\/w\/([^/]+)(\/.*)?$/)
+	if (match) {
+		return match[2] || '/'
+	}
+	return url.pathname
+}
diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte
index 197275fbc15ec..a0e0a38134621 100644
--- a/frontend/src/lib/components/ArgInput.svelte
+++ b/frontend/src/lib/components/ArgInput.svelte
@@ -40,7 +40,7 @@
 	import MultiSelect from './select/MultiSelect.svelte'
 	import { safeSelectItems } from './select/utils.svelte'
 	import S3ArgInput from './common/fileUpload/S3ArgInput.svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { workspaceStore } from '$lib/stores'
 	import { getJsonSchemaFromResource } from './schema/jsonSchemaResource.svelte'
 	import AIProviderPicker from './AIProviderPicker.svelte'
@@ -568,7 +568,7 @@
 			{#if value && typeof value == 'string' && value?.startsWith('$res:')}
 				Linked to resource <a
 					target="_blank"
-					href="{base}/resources#/resource/{value.slice(5)}"
+					href="{$wsBase}/resources#/resource/{value.slice(5)}"
 					class="text-blue-500 underline"
 					>{value.slice(5)} <span class="inline-block -mb-0.5"><ExternalLink size={14} /></span></a
 				>
diff --git a/frontend/src/lib/components/AutoscalingConfigEditor.svelte b/frontend/src/lib/components/AutoscalingConfigEditor.svelte
index 20fb30f3e7690..5ceea574fd78d 100644
--- a/frontend/src/lib/components/AutoscalingConfigEditor.svelte
+++ b/frontend/src/lib/components/AutoscalingConfigEditor.svelte
@@ -7,6 +7,7 @@
 	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 	import { Alert, Button } from './common'
 	import { ExternalLink } from 'lucide-svelte'
+	import { getWsBase } from '$lib/workspaceUrl'
 	import TextInput from './text_input/TextInput.svelte'
 	import Label from './Label.svelte'
 	import MultiSelect from './select/MultiSelect.svelte'
@@ -189,7 +190,7 @@
 										variant="default"
 										target="_blank"
 										endIcon={{ icon: ExternalLink }}
-										href="/scripts/add?hub=hub%2F9204%2Fhelper%2FScale%20a%20worker%20group%20deployed%20as%20a%20kubernetes%20service&workspace=admins"
+										href="{getWsBase('admins')}/scripts/add?hub=hub%2F9204%2Fhelper%2FScale%20a%20worker%20group%20deployed%20as%20a%20kubernetes%20service"
 										>Create from template
 										{disabled}
 									</Button>
@@ -197,7 +198,7 @@
 									<Button
 										variant="default"
 										target="_blank"
-										href={`/runs/${config.integration.path}?workspace=admins`}
+										href={`${getWsBase('admins')}/runs/${config.integration.path}`}
 										endIcon={{ icon: ExternalLink }}
 										{disabled}
 									>
diff --git a/frontend/src/lib/components/CompareWorkspaces.svelte b/frontend/src/lib/components/CompareWorkspaces.svelte
index 6905ed693188d..dbd14d3ad2a8b 100644
--- a/frontend/src/lib/components/CompareWorkspaces.svelte
+++ b/frontend/src/lib/components/CompareWorkspaces.svelte
@@ -57,7 +57,7 @@
 	import type { TriggerKind } from './triggers'
 	import { triggerDisplayNamesMap, triggerKindToTriggerType } from './triggers/utils'
 	import { getEmailAddress, getEmailDomain } from './triggers/email/utils'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 
@@ -683,7 +683,7 @@
 
 	function getTriggerHref(triggerKind: TriggerKind): string | undefined {
 		const pagePath = triggerKindToPagePath[triggerKind]
-		return pagePath ? `${base}${pagePath}` : undefined
+		return pagePath ? `${$wsBase}${pagePath}` : undefined
 	}
 
 	// Fetch triggers when workspace is available
diff --git a/frontend/src/lib/components/DeployWorkspace.svelte b/frontend/src/lib/components/DeployWorkspace.svelte
index 9f1fd711466d4..c82151ff5379e 100644
--- a/frontend/src/lib/components/DeployWorkspace.svelte
+++ b/frontend/src/lib/components/DeployWorkspace.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher, untrack } from 'svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { enterpriseLicense, superadmin, workspaceStore } from '$lib/stores'
 	import {
 		AppService,
@@ -422,7 +422,7 @@
 	>
 {:else}
 	<Alert type="info" title="Shareable page"
-		>Share this <a href="{base}/deploy/{kind}/{initialPath}">link</a> to have another properly permissioned
+		>Share this <a href="{$wsBase}/deploy/{kind}/{initialPath}">link</a> to have another properly permissioned
 		user do the deployment</Alert
 	>
 
diff --git a/frontend/src/lib/components/EditorBar.svelte b/frontend/src/lib/components/EditorBar.svelte
index ee2108711c6db..a37ac6664cb9f 100644
--- a/frontend/src/lib/components/EditorBar.svelte
+++ b/frontend/src/lib/components/EditorBar.svelte
@@ -17,7 +17,7 @@
 	import { ResourceService, VariableService, WorkspaceService, type Script } from '$lib/gen'
 
 	import { workspaceStore } from '$lib/stores'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import type Editor from './Editor.svelte'
 	import ItemPicker from './ItemPicker.svelte'
 	import VariableEditor from './VariableEditor.svelte'
@@ -681,7 +681,7 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 				startIcon={{ icon: Plus }}
 				target="_blank"
 				variant="accent"
-				href="{base}/resources?connect_app=undefined"
+				href="{$wsBase}/resources?connect_app=undefined"
 			>
 				Add resource
 			</Button>
@@ -739,7 +739,7 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 					startIcon={{ icon: Settings }}
 					target="_blank"
 					variant="accent"
-					href="{base}/workspace_settings?tab=windmill_lfs"
+					href="{$wsBase}/workspace_settings?tab=windmill_lfs"
 				>
 					Go to settings
 				</Button>
@@ -782,7 +782,7 @@ JsonNode ${windmillPathToCamelCaseName(path)} = JsonNode.Parse(await client.GetS
 					startIcon={{ icon: Settings }}
 					target="_blank"
 					variant="accent"
-					href="{base}/workspace_settings?tab=windmill_data_tables"
+					href="{$wsBase}/workspace_settings?tab=windmill_data_tables"
 				>
 					Go to settings
 				</Button>
diff --git a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
index 6c0f3fb5cef2f..4edc2692ebe1b 100644
--- a/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
+++ b/frontend/src/lib/components/ErrorOrRecoveryHandler.svelte
@@ -30,7 +30,7 @@
 	import ChannelSelector from '$lib/components/ChannelSelector.svelte'
 
 	import type { Schema, SupportedLanguage } from '$lib/common'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { enterpriseLicense, workspaceStore } from '$lib/stores'
 	import MsTeamsIcon from '$lib/components/icons/MSTeamsIcon.svelte'
 	import { classNames, emptySchema, emptyString, sendUserToast, tryEvery } from '$lib/utils'
@@ -493,7 +493,7 @@
 
 									<a
 										target="_blank"
-										href={`${base}/run/${connectionTestJob.uuid}?workspace=${$workspaceStore}`}
+										href={`${$wsBase}/run/${connectionTestJob.uuid}`}
 										class="inline-flex items-center gap-1"
 									>
 										{connectionTestJob.uuid}
@@ -585,7 +585,7 @@
 								Message sent via Windmill job
 								<a
 									target="_blank"
-									href={`${base}/run/${connectionTestJob.uuid}?workspace=${$workspaceStore}`}
+									href={`${$wsBase}/run/${connectionTestJob.uuid}`}
 								>
 									{connectionTestJob.uuid}
 								</a>
diff --git a/frontend/src/lib/components/FlowLogViewer.svelte b/frontend/src/lib/components/FlowLogViewer.svelte
index 465275be9d2e9..3c7fab19a0638 100644
--- a/frontend/src/lib/components/FlowLogViewer.svelte
+++ b/frontend/src/lib/components/FlowLogViewer.svelte
@@ -10,8 +10,7 @@
 		ExternalLink,
 		Keyboard
 	} from 'lucide-svelte'
-	import { base } from '$lib/base'
-	import { workspaceStore } from '$lib/stores'
+	import { wsBase } from '$lib/workspaceUrl'
 	import ObjectViewer from './propertyPicker/ObjectViewer.svelte'
 	import LogViewer from './LogViewer.svelte'
 	import FlowLogViewer from './FlowLogViewer.svelte'
@@ -98,7 +97,7 @@
 
 	function getJobLink(jobId: string | undefined): string {
 		if (!jobId) return ''
-		return `${base}/run/${jobId}?workspace=${workspaceId ?? $workspaceStore}`
+		return `${$wsBase}/run/${jobId}`
 	}
 
 	function getStatusColor(status: FlowStatusModule['type'] | undefined): string {
diff --git a/frontend/src/lib/components/FlowMetadata.svelte b/frontend/src/lib/components/FlowMetadata.svelte
index 3d4be84545cd6..8a05f595a2c96 100644
--- a/frontend/src/lib/components/FlowMetadata.svelte
+++ b/frontend/src/lib/components/FlowMetadata.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
 	import { type Job } from '$lib/gen'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import JobStatus from '$lib/components/JobStatus.svelte'
 	import { displayDate, truncateRev } from '$lib/utils'
 	import ScheduleEditor from '$lib/components/triggers/schedules/ScheduleEditor.svelte'
 	import TimeAgo from './TimeAgo.svelte'
-	import { workspaceStore } from '$lib/stores'
 	import Tooltip from './Tooltip.svelte'
 	import { Clock, MemoryStick, Calendar, Bot, User, Code2 } from 'lucide-svelte'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
@@ -57,7 +56,7 @@
 					<BarsStaggered size={SMALL_ICON_SIZE} class="min-w-3.5" />
 					<span class="whitespace-nowrap">
 						Step of flow
-						<a href={`${base}/run/${job.parent_job}?workspace=${$workspaceStore}`}>
+						<a href={`${$wsBase}/run/${job.parent_job}`}>
 							{truncateRev(job.parent_job, 18)}
 						</a>
 					</span>
@@ -67,7 +66,7 @@
 					<Bot size={SMALL_ICON_SIZE} class="min-w-3.5" />
 					<span class="whitespace-nowrap">
 						Triggered by parent
-						<a href={`${base}/run/${job.parent_job}?workspace=${$workspaceStore}`}>
+						<a href={`${$wsBase}/run/${job.parent_job}`}>
 							{job.parent_job}</a
 						>
 					</span>
@@ -94,7 +93,7 @@
 		{#if (job && job.job_kind == 'flow') || job?.job_kind == 'script'}
 			{@const stem = `${job?.job_kind}s`}
 			{@const isScript = job?.job_kind === 'script'}
-			{@const viewHref = `${base}/${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
+			{@const viewHref = `${$wsBase}/${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
 			<div class="flex flex-row gap-2 items-center">
 				{#if isScript}
 					<Code2 size={SMALL_ICON_SIZE} class="min-w-3.5" />
@@ -125,6 +124,6 @@
 	</div>
 	<div class="text-secondary text-2xs pt-2 whitespace-nowrap">
 		run id:
-		<a href={`${base}/run/${job.id}?workspace=${job.workspace_id}`}> {job.id} </a>
+		<a href={`${$wsBase}/run/${job.id}`}> {job.id} </a>
 	</div>
 </div>
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index 8aaeadb5ef8ba..a6c2f799528c6 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -15,7 +15,7 @@
 		type FlowValue
 	} from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import FlowJobResult from './FlowJobResult.svelte'
 	import WorkflowTimeline from './WorkflowTimeline.svelte'
 	import DisplayResult from './DisplayResult.svelte'
@@ -2058,8 +2058,8 @@
 																			class="text-right text-xs"
 																			rel="noreferrer"
 																			target="_blank"
-																			href="{base}/run/{node.job_id ??
-																				''}?workspace={job?.workspace_id}"
+																			href="{$wsBase}/run/{node.job_id ??
+																				''}"
 																		>
 																			{truncateRev(node.job_id ?? '', 10)}
 																			<ExternalLink size={12} class="inline-block" />
diff --git a/frontend/src/lib/components/Login.svelte b/frontend/src/lib/components/Login.svelte
index c1a2a7ebdb093..71cbc4e997f7b 100644
--- a/frontend/src/lib/components/Login.svelte
+++ b/frontend/src/lib/components/Login.svelte
@@ -13,6 +13,7 @@
 	import { usersWorkspaceStore, workspaceStore, userStore } from '$lib/stores'
 	import { classNames, emptyString, escapeHtml, parseQueryParams } from '$lib/utils'
 	import { base } from '$lib/base'
+	import { extractWorkspaceFromPath } from '$lib/workspaceUrl'
 	import { getUserExt } from '$lib/user'
 	import { sendUserToast } from '$lib/toast'
 	import { isCloudHosted } from '$lib/cloud'
@@ -140,7 +141,10 @@
 		if ($workspaceStore) {
 			goto(rd ?? '/')
 		} else {
-			let workspaceTarget = parseQueryParams(rd ?? undefined)['workspace']
+			// Extract workspace from rd path (/w/<ws>/...) or query param (?workspace=X)
+			let workspaceTarget =
+				extractWorkspaceFromPath(rd ?? '') ??
+				parseQueryParams(rd ?? undefined)['workspace']
 			if (rd && workspaceTarget) {
 				$workspaceStore = workspaceTarget
 				goto(rd)
diff --git a/frontend/src/lib/components/PersistentScriptDrawer.svelte b/frontend/src/lib/components/PersistentScriptDrawer.svelte
index 23fa122b7d738..7da12252a7fca 100644
--- a/frontend/src/lib/components/PersistentScriptDrawer.svelte
+++ b/frontend/src/lib/components/PersistentScriptDrawer.svelte
@@ -4,7 +4,7 @@
 	import DrawerContent from './common/drawer/DrawerContent.svelte'
 	import { createEventDispatcher, onDestroy } from 'svelte'
 	import { workspaceStore } from '$lib/stores'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { displayDate, sleep, sendUserToast } from '$lib/utils'
 	import TableCustom from './TableCustom.svelte'
 	import { Hourglass, Loader2, Play, RefreshCw } from 'lucide-svelte'
@@ -139,7 +139,7 @@
 							<td class="text-xs">
 								<a
 									class="pr-3"
-									href="{base}/scripts/get/{scriptHash}?workspace={$workspaceStore}"
+									href="{$wsBase}/scripts/get/{scriptHash}"
 									target="_blank"
 								>
 									{scriptHash}
@@ -148,7 +148,7 @@
 							<td class="text-xs">
 								<a
 									class="pr-3"
-									href="{base}/run/{jobId}?workspace={$workspaceStore}"
+									href="{$wsBase}/run/{jobId}"
 									target="_blank">{jobId.substring(24)}</a
 								>
 							</td>
diff --git a/frontend/src/lib/components/S3FilePickerInner.svelte b/frontend/src/lib/components/S3FilePickerInner.svelte
index 9968c23180a62..c80f76976237c 100644
--- a/frontend/src/lib/components/S3FilePickerInner.svelte
+++ b/frontend/src/lib/components/S3FilePickerInner.svelte
@@ -30,6 +30,7 @@
 		type MoveS3FileResponse
 	} from '$lib/gen'
 	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import {
 		displayDate,
 		displaySize,
@@ -555,7 +556,7 @@
 				<p class="text-clip grow min-w-0">
 					The workspace needs to be connected to an S3 storage to use this feature. You can <a
 						target="_blank"
-						href="{base}/workspace_settings?tab=windmill_lfs">configure it here</a
+						href="{$wsBase}/workspace_settings?tab=windmill_lfs">configure it here</a
 					>.
 				</p>
 				<Button variant="default" on:click={reloadContent} startIcon={{ icon: RotateCw }} />
diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte
index 2690301f28eff..a5f82aa299018 100644
--- a/frontend/src/lib/components/ScriptEditor.svelte
+++ b/frontend/src/lib/components/ScriptEditor.svelte
@@ -80,7 +80,7 @@
 	import CaptureButton from './triggers/CaptureButton.svelte'
 	import { setContext } from 'svelte'
 	import HideButton from './apps/editor/settingsPanel/HideButton.svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { SUPPORTED_CHAT_SCRIPT_LANGUAGES } from './copilot/chat/script/core'
 	import { getStringError } from './copilot/chat/utils'
 	import type { ScriptOptions } from './copilot/chat/ContextManager.svelte'
@@ -1943,7 +1943,7 @@
 							{#snippet popoverOverride()}
 								<div class="text-sm">
 									Enable Windmill AI in the <a
-										href="{base}/workspace_settings?tab=ai"
+										href="{$wsBase}/workspace_settings?tab=ai"
 										target="_blank"
 										class="inline-flex flex-row items-center gap-1"
 									>
diff --git a/frontend/src/lib/components/ScriptPicker.svelte b/frontend/src/lib/components/ScriptPicker.svelte
index 803684f49e7bc..0e968ef26e5d8 100644
--- a/frontend/src/lib/components/ScriptPicker.svelte
+++ b/frontend/src/lib/components/ScriptPicker.svelte
@@ -2,7 +2,7 @@
 	import { ScriptService, FlowService, type Script, AppService } from '$lib/gen'
 
 	import { workspaceStore } from '$lib/stores'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { createEventDispatcher, untrack } from 'svelte'
 
 	import Select from './select/Select.svelte'
@@ -158,7 +158,7 @@
 						target="_blank"
 						variant="default"
 						size="xs"
-						href="{base}/flows/edit/{scriptPath}">Edit</Button
+						href="{$wsBase}/flows/edit/{scriptPath}">Edit</Button
 					>
 				{/if}
 				{#if allowView}
@@ -181,7 +181,7 @@
 						target="_blank"
 						variant="default"
 						size="xs"
-						href="{base}/apps/edit/{scriptPath}"
+						href="{$wsBase}/apps/edit/{scriptPath}"
 					>
 						Edit
 					</Button>
@@ -192,7 +192,7 @@
 						size="xs"
 						target="_blank"
 						startIcon={{ icon: Code }}
-						href="{base}/apps/get/{scriptPath}"
+						href="{$wsBase}/apps/get/{scriptPath}"
 					>
 						View
 					</Button>
@@ -206,7 +206,7 @@
 						target="_blank"
 						variant="default"
 						size="xs"
-						href="{base}/scripts/edit/{scriptPath}"
+						href="{$wsBase}/scripts/edit/{scriptPath}"
 					>
 						Edit
 					</Button>
diff --git a/frontend/src/lib/components/SuperadminSettingsInner.svelte b/frontend/src/lib/components/SuperadminSettingsInner.svelte
index 683db577241cb..3bba042194df6 100644
--- a/frontend/src/lib/components/SuperadminSettingsInner.svelte
+++ b/frontend/src/lib/components/SuperadminSettingsInner.svelte
@@ -6,7 +6,7 @@
 	import InviteGlobalUser from '$lib/components/InviteGlobalUser.svelte'
 	import { Button } from '$lib/components/common'
 	import { sendUserToast } from '$lib/toast'
-	import { base } from '$lib/base'
+	import { wsBase, getWsBase } from '$lib/workspaceUrl'
 	import SearchItems from './SearchItems.svelte'
 	import { page } from '$app/state'
 	import { goto as gotoUrl } from '$app/navigation'
@@ -201,7 +201,7 @@
 				<Button
 					variant="default"
 					target="_blank"
-					href="{base}/?workspace=admins"
+					href="{getWsBase('admins')}/"
 					endIcon={{ icon: ExternalLink }}
 				>
 					Admins workspace
@@ -222,7 +222,7 @@
 				{#if $workspaceStore !== 'admins'}
 					<div class="mt-4 pt-2 border-t border-surface-hover">
 						<a
-							href="{base}/?workspace=admins"
+							href="{getWsBase('admins')}/"
 							target="_blank"
 							class="flex items-center gap-2 px-2 py-1.5 text-xs text-secondary hover:text-primary transition-colors"
 						>
@@ -486,7 +486,7 @@
 															{/key}
 															{#if role_source === 'instance_group' && (super_admin || devops)}
 																<a
-																	href="{base}/groups"
+																	href="{$wsBase}/groups"
 																	class="text-2xs text-tertiary mt-0.5 ml-1 hover:underline"
 																	title="Role set by instance group. You can upgrade to a higher role manually, but demoting to &quot;User&quot; requires removing them from the group."
 																	onclick={() => closeDrawer?.()}
diff --git a/frontend/src/lib/components/TimelineBar.svelte b/frontend/src/lib/components/TimelineBar.svelte
index e4fb511450321..20de1788f2b2f 100644
--- a/frontend/src/lib/components/TimelineBar.svelte
+++ b/frontend/src/lib/components/TimelineBar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { msToSec } from '$lib/utils'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { ExternalLink } from 'lucide-svelte'
 	import Popover from './Popover.svelte'
 
@@ -46,7 +46,7 @@
 				: 'rounded-sm'} center-center text-white text-2xs whitespace-nowrap hover:outline outline-1 outline-black"
 	>
 		{#snippet text()}
-			<a href="{base}/run/{id}" class="inline-flex items-center gap-1" target="_blank"
+			<a href="{$wsBase}/run/{id}" class="inline-flex items-center gap-1" target="_blank"
 				>{id} <ExternalLink size={14} /></a
 			>
 		{/snippet}
diff --git a/frontend/src/lib/components/WorkflowTimeline.svelte b/frontend/src/lib/components/WorkflowTimeline.svelte
index 2ea5ebba5006f..2d281e89a7b29 100644
--- a/frontend/src/lib/components/WorkflowTimeline.svelte
+++ b/frontend/src/lib/components/WorkflowTimeline.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { displayDate, msToSec, emptyString } from '$lib/utils'
 	import { onDestroy } from 'svelte'
 	import { getDbClockNow } from '$lib/forLater'
@@ -307,7 +307,7 @@
 								<a
 									target="_blank"
 									class="inline-flex gap-2 items-baseline hover:underline whitespace-nowrap"
-									href="{base}/run/{k}"
+									href="{$wsBase}/run/{k}"
 									onclick={(e) => e.stopPropagation()}
 								>
 									{v.name ?? k}
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 41a72fd88b933..57346988c910e 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -32,6 +32,7 @@
 	import { selectId } from '../../editor/appUtils'
 	import { collectOneOfFields } from '../../editor/appUtilsCore'
 	import { userStore } from '$lib/stores'
+	import { getWsBase } from '$lib/workspaceUrl'
 	import { get } from 'svelte/store'
 	import RefreshButton from '$lib/components/apps/components/helpers/RefreshButton.svelte'
 	import { ctxRegex } from '../../utils'
@@ -923,7 +924,7 @@
 										{/if}
 										{#if lastJobId}
 											<a
-												href={`/run/${lastJobId}?workspace=${workspace}`}
+												href={`${getWsBase(workspace)}/run/${lastJobId}`}
 												class="font-semibold text-red-800 underline"
 												target="_blank"
 											>
diff --git a/frontend/src/lib/components/apps/editor/AppReportsDrawerInner.svelte b/frontend/src/lib/components/apps/editor/AppReportsDrawerInner.svelte
index 3f25cca3b08b8..23ce90b61d72e 100644
--- a/frontend/src/lib/components/apps/editor/AppReportsDrawerInner.svelte
+++ b/frontend/src/lib/components/apps/editor/AppReportsDrawerInner.svelte
@@ -15,7 +15,7 @@
 		WorkspaceService
 	} from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { emptyString, formatCron, sendUserToast, tryEvery } from '$lib/utils'
 	import SchemaForm from '$lib/components/SchemaForm.svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
@@ -644,7 +644,7 @@
 								<p class="text-clip grow min-w-0">
 									The workspace needs to be connected to Slack to use this feature. You can <a
 										target="_blank"
-										href="{base}/workspace_settings?tab=slack">configure it here</a
+										href="{$wsBase}/workspace_settings?tab=slack">configure it here</a
 									>.
 								</p>
 								<Button
diff --git a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptRunnableByPath.svelte b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptRunnableByPath.svelte
index 5d6ddf7b93d77..69524f76b7735 100644
--- a/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptRunnableByPath.svelte
+++ b/frontend/src/lib/components/apps/editor/inlineScriptsPanel/InlineScriptRunnableByPath.svelte
@@ -3,7 +3,7 @@
 
 	const bubble = createBubbler()
 	import { Button, Drawer, DrawerContent } from '$lib/components/common'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import FlowModuleScript from '$lib/components/flows/content/FlowModuleScript.svelte'
 	import FlowPathViewer from '$lib/components/flows/content/FlowPathViewer.svelte'
 	import { emptySchema, sendUserToast } from '$lib/utils'
@@ -259,7 +259,7 @@
 				startIcon={{ icon: Eye }}
 				endIcon={{ icon: ExternalLink }}
 				target="_blank"
-				href="{base}/flows/get/{runnable.path}?workspace={$workspaceStore}"
+				href="{$wsBase}/flows/get/{runnable.path}"
 			>
 				Details
 			</Button>
diff --git a/frontend/src/lib/components/common/table/AppRow.svelte b/frontend/src/lib/components/common/table/AppRow.svelte
index 711237a210501..2da4da52e0330 100644
--- a/frontend/src/lib/components/common/table/AppRow.svelte
+++ b/frontend/src/lib/components/common/table/AppRow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import Dropdown from '$lib/components/DropdownV2.svelte'
 	import type MoveDrawer from '$lib/components/MoveDrawer.svelte'
 	import SharedBadge from '$lib/components/SharedBadge.svelte'
@@ -78,7 +78,7 @@
 {/if}
 
 <Row
-	href="{base}/apps{app.raw_app ? '_raw' : ''}/get/{app.path}"
+	href="{$wsBase}/apps{app.raw_app ? '_raw' : ''}/get/{app.path}"
 	kind="app"
 	{marked}
 	path={app.path}
@@ -109,7 +109,7 @@
 							variant="subtle"
 							wrapperClasses="w-20"
 							startIcon={{ icon: Pen }}
-							href="{base}/apps{app.raw_app ? '_raw' : ''}/edit/{app.path}?nodraft=true"
+							href="{$wsBase}/apps{app.raw_app ? '_raw' : ''}/edit/{app.path}?nodraft=true"
 						>
 							Edit
 						</Button>
@@ -172,7 +172,7 @@
 					{
 						displayName: 'Duplicate/Fork',
 						icon: GitFork,
-						href: `${base}/apps${app.raw_app ? '_raw' : ''}/add?template=${path}`,
+						href: `${$wsBase}/apps${app.raw_app ? '_raw' : ''}/add?template=${path}`,
 						disabled: !showEditButton,
 						hide: $userStore?.operator
 					},
diff --git a/frontend/src/lib/components/common/table/FlowRow.svelte b/frontend/src/lib/components/common/table/FlowRow.svelte
index 4fbe93faceb7b..5d0b3b90885d7 100644
--- a/frontend/src/lib/components/common/table/FlowRow.svelte
+++ b/frontend/src/lib/components/common/table/FlowRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { goto } from '$lib/navigation'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import Dropdown from '$lib/components/DropdownV2.svelte'
 	import type MoveDrawer from '$lib/components/MoveDrawer.svelte'
 	import ScheduleEditor from '$lib/components/triggers/schedules/ScheduleEditor.svelte'
@@ -102,8 +102,8 @@
 	aiId={`flow-row-${flow.path}`}
 	aiDescription={`Button to access the form to run the flow ${flow.summary ?? flow.path}`}
 	href={flow.draft_only
-		? `${base}/flows/edit/${flow.path}?nodraft=true`
-		: `${base}/flows/get/${flow.path}?workspace=${$workspaceStore}`}
+		? `${$wsBase}/flows/edit/${flow.path}?nodraft=true`
+		: `${$wsBase}/flows/get/${flow.path}`}
 	kind="flow"
 	workspaceId={flow.workspace_id ?? $workspaceStore ?? ''}
 	{marked}
@@ -131,7 +131,7 @@
 							wrapperClasses="w-20"
 							unifiedSize="md"
 							startIcon={{ icon: Pen }}
-							href="{base}/flows/edit/{flow.path}?nodraft=true"
+							href="{$wsBase}/flows/edit/{flow.path}?nodraft=true"
 							aiId={`edit-flow-button-${flow.summary?.length > 0 ? flow.summary : flow.path}`}
 							aiDescription={`Edits the flow ${flow.summary?.length > 0 ? flow.summary : flow.path}`}
 						>
@@ -187,12 +187,12 @@
 					{
 						displayName: 'View runs',
 						icon: List,
-						href: `${base}/runs/${path}`
+						href: `${$wsBase}/runs/${path}`
 					},
 					{
 						displayName: 'Duplicate/Fork',
 						icon: GitFork,
-						href: `${base}/flows/add?template=${path}`,
+						href: `${$wsBase}/flows/add?template=${path}`,
 						disabled: !showEditButton,
 						hide: $userStore?.operator
 					},
@@ -205,7 +205,7 @@
 					{
 						displayName: 'Audit logs',
 						icon: Eye,
-						href: `${base}/audit_logs?resource=${path}`,
+						href: `${$wsBase}/audit_logs?resource=${path}`,
 						hide: $userStore?.operator
 					},
 					{
diff --git a/frontend/src/lib/components/common/table/RawAppRow.svelte b/frontend/src/lib/components/common/table/RawAppRow.svelte
index 76019553f1d1a..709862758e582 100644
--- a/frontend/src/lib/components/common/table/RawAppRow.svelte
+++ b/frontend/src/lib/components/common/table/RawAppRow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import Dropdown from '$lib/components/DropdownV2.svelte'
 	import SharedBadge from '$lib/components/SharedBadge.svelte'
 	import type ShareModal from '$lib/components/ShareModal.svelte'
@@ -31,7 +31,7 @@
 </script>
 
 <Row
-	href="{base}/apps/get_raw/{app.version}/{app.path}"
+	href="{$wsBase}/apps/get_raw/{app.version}/{app.path}"
 	kind="raw_app"
 	{marked}
 	path={app.path}
diff --git a/frontend/src/lib/components/common/table/ScriptRow.svelte b/frontend/src/lib/components/common/table/ScriptRow.svelte
index 91a2bd3b3b502..b2ba5989d5039 100644
--- a/frontend/src/lib/components/common/table/ScriptRow.svelte
+++ b/frontend/src/lib/components/common/table/ScriptRow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { goto } from '$lib/navigation'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import Dropdown from '$lib/components/DropdownV2.svelte'
 	import type MoveDrawer from '$lib/components/MoveDrawer.svelte'
 	import ScheduleEditor from '$lib/components/triggers/schedules/ScheduleEditor.svelte'
@@ -120,8 +120,8 @@
 	aiId={`script-run-button-${script.path}`}
 	aiDescription={`Button to access the form to run the script ${script.summary ?? script.path}`}
 	href={script.draft_only || (script.auto_kind === 'lib' && script.kind !== 'preprocessor')
-		? `${base}/scripts/edit/${script.path}`
-		: `${base}/scripts/get/${script.hash}?workspace=${$workspaceStore}`}
+		? `${$wsBase}/scripts/edit/${script.path}`
+		: `${$wsBase}/scripts/get/${script.hash}`}
 	kind="script"
 	{marked}
 	path={script.path}
@@ -182,7 +182,7 @@
 								wrapperClasses="w-20"
 								unifiedSize="md"
 								startIcon={{ icon: Pen }}
-								href="{base}/scripts/edit/{script.path}"
+								href="{$wsBase}/scripts/edit/{script.path}"
 							>
 								Edit
 							</Button>
@@ -264,7 +264,7 @@
 					{
 						displayName: 'Duplicate/Fork',
 						icon: GitFork,
-						href: `${base}/scripts/add?template=${script.path}`,
+						href: `${$wsBase}/scripts/add?template=${script.path}`,
 						disabled: !showEditButton,
 						hide: $userStore?.operator
 					},
@@ -299,7 +299,7 @@
 					{
 						displayName: 'View runs',
 						icon: List,
-						href: `${base}/runs/${script.path}`
+						href: `${$wsBase}/runs/${script.path}`
 					},
 					{
 						displayName: 'Versions',
@@ -311,7 +311,7 @@
 					{
 						displayName: 'Audit logs',
 						icon: Eye,
-						href: `${base}/audit_logs?resource=${script.path}`,
+						href: `${$wsBase}/audit_logs?resource=${script.path}`,
 						hide: $userStore?.operator
 					},
 					{
@@ -431,7 +431,7 @@
 				openDetails
 				on:openDetails={(e) => {
 					if (script) {
-						goto(`/scripts/get/${e.detail.version}?workspace=${$workspaceStore}`)
+						goto(`/scripts/get/${e.detail.version}`)
 					}
 					versionsDrawerOpen = false
 				}}
diff --git a/frontend/src/lib/components/copilot/CronGen.svelte b/frontend/src/lib/components/copilot/CronGen.svelte
index 02a45aa767d8b..69c6375a32dd6 100644
--- a/frontend/src/lib/components/copilot/CronGen.svelte
+++ b/frontend/src/lib/components/copilot/CronGen.svelte
@@ -5,7 +5,7 @@
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import { sendUserToast } from '$lib/toast'
 
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
 	import { copilotInfo } from '$lib/aiStore'
 	import { untrack } from 'svelte'
@@ -131,7 +131,7 @@
 				<div class="block text-primary">
 					<p class="text-sm"
 						>Enable Windmill AI in the <a
-							href="{base}/workspace_settings?tab=ai"
+							href="{$wsBase}/workspace_settings?tab=ai"
 							target="_blank"
 							class="inline-flex flex-row items-center gap-1"
 							>workspace settings <ExternalLink size={16} /></a
diff --git a/frontend/src/lib/components/copilot/FlowInlineScriptAIButton.svelte b/frontend/src/lib/components/copilot/FlowInlineScriptAIButton.svelte
index a27cc363407cb..71e11048198e7 100644
--- a/frontend/src/lib/components/copilot/FlowInlineScriptAIButton.svelte
+++ b/frontend/src/lib/components/copilot/FlowInlineScriptAIButton.svelte
@@ -3,7 +3,7 @@
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import Button from '../common/button/Button.svelte'
 	import { ExternalLink, WandSparkles } from 'lucide-svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { twMerge } from 'tailwind-merge'
 	import { aiChatManager, AIMode } from './chat/AIChatManager.svelte'
 	import { copilotInfo } from '$lib/aiStore'
@@ -59,7 +59,7 @@
 			<div class="p-4">
 				<p class="text-sm">
 					Enable Windmill AI in the <a
-						href="{base}/workspace_settings?tab=ai"
+						href="{$wsBase}/workspace_settings?tab=ai"
 						target="_blank"
 						class="inline-flex flex-row items-center gap-1"
 					>
diff --git a/frontend/src/lib/components/copilot/RegexGen.svelte b/frontend/src/lib/components/copilot/RegexGen.svelte
index b716e48385388..3b944675686a8 100644
--- a/frontend/src/lib/components/copilot/RegexGen.svelte
+++ b/frontend/src/lib/components/copilot/RegexGen.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { run } from 'svelte/legacy';
 
-	import { base } from '$lib/base'
 	import { Button } from '../common'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	import { getNonStreamingCompletion } from './lib'
 	import { sendUserToast } from '$lib/toast'
@@ -174,7 +174,7 @@
 				{:else}
 					<p class="text-sm">
 						Enable Windmill AI in the <a
-							href="{base}/workspace_settings?tab=ai"
+							href="{$wsBase}/workspace_settings?tab=ai"
 							target="_blank"
 							class="inline-flex flex-row items-center gap-1"
 						>
diff --git a/frontend/src/lib/components/copilot/ResourceGen.svelte b/frontend/src/lib/components/copilot/ResourceGen.svelte
index aa18ca0546f28..38c9aea3a1cfc 100644
--- a/frontend/src/lib/components/copilot/ResourceGen.svelte
+++ b/frontend/src/lib/components/copilot/ResourceGen.svelte
@@ -4,7 +4,7 @@
 	import { getNonStreamingCompletion } from './lib'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import { sendUserToast } from '$lib/toast'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import type { ChatCompletionMessageParam } from 'openai/resources/index.mjs'
 	import { copilotInfo } from '$lib/aiStore'
 	import type { Schema } from '$lib/common'
@@ -173,7 +173,7 @@
 				<div class="block text-primary">
 					<p class="text-sm"
 						>Enable Windmill AI in the <a
-							href="{base}/workspace_settings?tab=ai"
+							href="{$wsBase}/workspace_settings?tab=ai"
 							target="_blank"
 							class="inline-flex flex-row items-center gap-1"
 							>workspace settings <ExternalLink size={16} /></a
diff --git a/frontend/src/lib/components/copilot/ScriptFix.svelte b/frontend/src/lib/components/copilot/ScriptFix.svelte
index 2deaef0193570..f51bfad08d06d 100644
--- a/frontend/src/lib/components/copilot/ScriptFix.svelte
+++ b/frontend/src/lib/components/copilot/ScriptFix.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { base } from '$lib/base'
 	import { Button } from '../common'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	import { SUPPORTED_LANGUAGES } from './lib'
 	import type { SupportedLanguage } from '$lib/common'
@@ -57,7 +57,7 @@
 						<p class="text-sm"
 							>Enable Windmill AI in the <a
 								class="inline-flex flex-row items-center gap-1"
-								href="{base}/workspace_settings?tab=ai"
+								href="{$wsBase}/workspace_settings?tab=ai"
 								target="_blank">workspace settings</a
 							></p
 						></div
diff --git a/frontend/src/lib/components/copilot/ScriptGen.svelte b/frontend/src/lib/components/copilot/ScriptGen.svelte
index 0c7156002d198..e69e8c2c623ca 100644
--- a/frontend/src/lib/components/copilot/ScriptGen.svelte
+++ b/frontend/src/lib/components/copilot/ScriptGen.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { base } from '$lib/base'
 	import { Button } from '../common'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	import { MAX_SCHEMA_LENGTH, SUPPORTED_LANGUAGES, addThousandsSeparator, copilot } from './lib'
 	import type { SupportedLanguage } from '$lib/common'
@@ -528,7 +528,7 @@
 				{:else}
 					<p class="text-sm">
 						Enable Windmill AI in the <a
-							href="{base}/workspace_settings?tab=ai"
+							href="{$wsBase}/workspace_settings?tab=ai"
 							target="_blank"
 							class="inline-flex flex-row items-center gap-1"
 						>
diff --git a/frontend/src/lib/components/copilot/StepInputsGen.svelte b/frontend/src/lib/components/copilot/StepInputsGen.svelte
index 93dca0eb5477d..d4f408a7f08b2 100644
--- a/frontend/src/lib/components/copilot/StepInputsGen.svelte
+++ b/frontend/src/lib/components/copilot/StepInputsGen.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import YAML from 'yaml'
 	import { yamlStringifyExceptKeys } from './utils'
 	import { sliceModules } from '../flows/flowStateUtils.svelte'
@@ -249,7 +249,7 @@ input_name2: expression2
 						{#if !$copilotInfo.enabled}
 							Enable Windmill AI in the{' '}
 							<a
-								href="{base}/workspace_settings?tab=ai"
+								href="{$wsBase}/workspace_settings?tab=ai"
 								target="_blank"
 								class="inline-flex flex-row items-center gap-1"
 							>
diff --git a/frontend/src/lib/components/copilot/chat/AIButton.svelte b/frontend/src/lib/components/copilot/chat/AIButton.svelte
index 139c524230aec..8f153413fad11 100644
--- a/frontend/src/lib/components/copilot/chat/AIButton.svelte
+++ b/frontend/src/lib/components/copilot/chat/AIButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { copilotInfo } from '$lib/aiStore'
 	import Popover from '$lib/components/meltComponents/Popover.svelte'
 	import DarkPopover from '$lib/components/Popover.svelte'
@@ -38,7 +38,7 @@
 			<div class="block text-primary p-4">
 				<p class="text-sm"
 					>Enable Windmill AI in the <a
-						href="{base}/workspace_settings?tab=ai"
+						href="{$wsBase}/workspace_settings?tab=ai"
 						target="_blank"
 						class="inline-flex flex-row items-center gap-1"
 						>workspace settings <ExternalLink size={16} /></a
diff --git a/frontend/src/lib/components/flows/CreateActionsApp.svelte b/frontend/src/lib/components/flows/CreateActionsApp.svelte
index 5cc0df15022e7..51d67a6057a25 100644
--- a/frontend/src/lib/components/flows/CreateActionsApp.svelte
+++ b/frontend/src/lib/components/flows/CreateActionsApp.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { goto } from '$lib/navigation'
-	import { base } from '$lib/base'
 
 	import { Button } from '$lib/components/common'
 	import Drawer from '$lib/components/common/drawer/Drawer.svelte'
@@ -40,12 +39,12 @@
 
 	function selectLowCode() {
 		appTypeModalOpen = false
-		goto(`${base}/apps/add?nodraft=true`)
+		goto('/apps/add?nodraft=true')
 	}
 
 	function selectFullCode() {
 		appTypeModalOpen = false
-		goto(`${base}/apps_raw/add?nodraft=true`)
+		goto('/apps_raw/add?nodraft=true')
 	}
 </script>
 
diff --git a/frontend/src/lib/components/flows/CreateActionsFlow.svelte b/frontend/src/lib/components/flows/CreateActionsFlow.svelte
index 73f8cfedbab2a..c4eb6af7f26ae 100644
--- a/frontend/src/lib/components/flows/CreateActionsFlow.svelte
+++ b/frontend/src/lib/components/flows/CreateActionsFlow.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { goto } from '$lib/navigation'
-	import { base } from '$lib/base'
 	import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
 
 	import { Button } from '$lib/components/common'
@@ -41,13 +40,13 @@
 		const parsed =
 			wacImportType === 'yaml' ? YAML.parse(pendingWacRaw ?? '') : JSON.parse(pendingWacRaw ?? '')
 		$importScriptStore = parsed
-		await goto(`${base}/scripts/add?import=true`)
+		await goto('/scripts/add?import=true')
 		wacDrawer?.closeDrawer?.()
 	}
 
 	function handleFlowClick() {
 		if (skipModal) {
-			goto(`${base}/flows/add?nodraft=true`)
+			goto('/flows/add?nodraft=true')
 		} else {
 			flowModalOpen = true
 		}
@@ -55,17 +54,17 @@
 
 	function selectFlowEditor() {
 		flowModalOpen = false
-		goto(`${base}/flows/add?nodraft=true`)
+		goto('/flows/add?nodraft=true')
 	}
 
 	function selectWacPython() {
 		flowModalOpen = false
-		goto(`${base}/scripts/add?nodraft=true&wac=python`)
+		goto('/scripts/add?nodraft=true&wac=python')
 	}
 
 	function selectWacTypescript() {
 		flowModalOpen = false
-		goto(`${base}/scripts/add?nodraft=true&wac=typescript`)
+		goto('/scripts/add?nodraft=true&wac=typescript')
 	}
 
 	function toggleSkipModal() {
diff --git a/frontend/src/lib/components/flows/propPicker/OutputBadge.svelte b/frontend/src/lib/components/flows/propPicker/OutputBadge.svelte
index 507e74ba86d57..5da1084c0b394 100644
--- a/frontend/src/lib/components/flows/propPicker/OutputBadge.svelte
+++ b/frontend/src/lib/components/flows/propPicker/OutputBadge.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { Job } from '$lib/gen'
 	import { twMerge } from 'tailwind-merge'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { ExternalLink } from 'lucide-svelte'
 	import { emptyString } from '$lib/utils'
 
@@ -42,7 +42,7 @@
 		{#if !emptyString(job.id)}
 			<a
 				target="_blank"
-				href="{base}/run/{job.id}?workspace={job.workspace_id}"
+				href="{$wsBase}/run/{job.id}"
 				class="text-right float-right text-gray-300 group-hover:text-gray-400 transition-all duration-200 dark:text-gray-500 dark:group-hover:text-gray-300"
 				title="See run detail in a new tab"
 			>
diff --git a/frontend/src/lib/components/git_sync/DetectionFlow.svelte b/frontend/src/lib/components/git_sync/DetectionFlow.svelte
index c4b25c8401a23..3693b368aa9ec 100644
--- a/frontend/src/lib/components/git_sync/DetectionFlow.svelte
+++ b/frontend/src/lib/components/git_sync/DetectionFlow.svelte
@@ -5,7 +5,7 @@
 	import GitSyncFilterSettings from '$lib/components/workspaceSettings/GitSyncFilterSettings.svelte'
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { sendUserToast } from '$lib/toast'
-	import { workspaceStore } from '$lib/stores'
+	import { wsBase } from '$lib/workspaceUrl'
 	import GitSyncModeDisplay from './GitSyncModeDisplay.svelte'
 
 	let { idx, mode } = $props<{ idx: number; mode?: 'sync' | 'promotion' }>()
@@ -188,7 +188,7 @@
 				<a
 					target="_blank"
 					class="underline"
-					href={`/run/${repo.detectionJobId}?workspace=${$workspaceStore}`}
+					href={`${$wsBase}/run/${repo.detectionJobId}`}
 				>
 					{repo.detectionJobId}
 				</a>
diff --git a/frontend/src/lib/components/git_sync/GitSyncRepositoryCard.svelte b/frontend/src/lib/components/git_sync/GitSyncRepositoryCard.svelte
index 8d4b7a03579b5..01cb6d4da8e4e 100644
--- a/frontend/src/lib/components/git_sync/GitSyncRepositoryCard.svelte
+++ b/frontend/src/lib/components/git_sync/GitSyncRepositoryCard.svelte
@@ -21,6 +21,7 @@
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { fade } from 'svelte/transition'
 	import { workspaceStore } from '$lib/stores'
+	import { wsBase } from '$lib/workspaceUrl'
 	import type { GitSyncRepository } from './GitSyncContext.svelte'
 	import GitSyncModeDisplay from './GitSyncModeDisplay.svelte'
 	import { ResourceService, VariableService } from '$lib/gen'
@@ -423,7 +424,7 @@
 					Git sync resource checked via Windmill job
 					<a
 						target="_blank"
-						href={`/run/${gitSyncTestJob.jobId}?workspace=${$workspaceStore}`}
+						href={`${$wsBase}/run/${gitSyncTestJob.jobId}`}
 						class="text-blue-500 hover:underline"
 					>
 						{gitSyncTestJob.jobId}
diff --git a/frontend/src/lib/components/git_sync/PullWorkspaceModal.svelte b/frontend/src/lib/components/git_sync/PullWorkspaceModal.svelte
index 0c7abbb921136..586795d7d68db 100644
--- a/frontend/src/lib/components/git_sync/PullWorkspaceModal.svelte
+++ b/frontend/src/lib/components/git_sync/PullWorkspaceModal.svelte
@@ -14,6 +14,7 @@
 	import GitDiffPreview from '../GitDiffPreview.svelte'
 	import { JobService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { sendUserToast } from '$lib/toast'
 	import hubPaths from '$lib/hubPaths.json'
 	import { jobManager } from '$lib/services/JobManager'
@@ -333,7 +334,7 @@
 				<a
 					target="_blank"
 					class="underline"
-					href={`/run/${previewJobId}?workspace=${$workspaceStore}`}
+					href={`${$wsBase}/run/${previewJobId}`}
 				>
 					{previewJobId}
 				</a>
@@ -550,7 +551,7 @@
 				<a
 					target="_blank"
 					class="underline"
-					href={`/run/${applyJobId}?workspace=${$workspaceStore}`}
+					href={`${$wsBase}/run/${applyJobId}`}
 				>
 					{applyJobId}
 				</a>
diff --git a/frontend/src/lib/components/git_sync/PushWorkspaceModal.svelte b/frontend/src/lib/components/git_sync/PushWorkspaceModal.svelte
index 87c6ecb8075c0..642783f9f442a 100644
--- a/frontend/src/lib/components/git_sync/PushWorkspaceModal.svelte
+++ b/frontend/src/lib/components/git_sync/PushWorkspaceModal.svelte
@@ -5,6 +5,7 @@
 	import GitDiffPreview from '../GitDiffPreview.svelte'
 	import { JobService } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
+	import { wsBase } from '$lib/workspaceUrl'
 	import hubPaths from '$lib/hubPaths.json'
 	import { jobManager } from '$lib/services/JobManager'
 	import type { SyncResponse, SettingsObject } from '$lib/git-sync'
@@ -220,7 +221,7 @@
 				<a
 					target="_blank"
 					class="underline"
-					href={`/run/${previewJobId}?workspace=${$workspaceStore}`}
+					href={`${$wsBase}/run/${previewJobId}`}
 				>
 					{previewJobId}
 				</a>
@@ -296,7 +297,7 @@
 				<a
 					target="_blank"
 					class="underline"
-					href={`/run/${applyJobId}?workspace=${$workspaceStore}`}
+					href={`${$wsBase}/run/${applyJobId}`}
 				>
 					{applyJobId}
 				</a>
diff --git a/frontend/src/lib/components/home/TutorialBanner.svelte b/frontend/src/lib/components/home/TutorialBanner.svelte
index 9661d6738a9d8..e046f8b876754 100644
--- a/frontend/src/lib/components/home/TutorialBanner.svelte
+++ b/frontend/src/lib/components/home/TutorialBanner.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Button } from '$lib/components/common'
 	import { GraduationCap, X } from 'lucide-svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { goto } from '$app/navigation'
 	import { sendUserToast, type ToastAction } from '$lib/toast'
 	import { getLocalSetting, storeLocalSetting } from '$lib/utils'
@@ -115,7 +115,7 @@
 	}
 
 	function goToTutorials() {
-		goto(`${base}/tutorials`)
+		goto(`${$wsBase}/tutorials`)
 	}
 </script>
 
diff --git a/frontend/src/lib/components/preview/FlowPreviewStatus.svelte b/frontend/src/lib/components/preview/FlowPreviewStatus.svelte
index 68587fbf24df0..6e4170ed4844d 100644
--- a/frontend/src/lib/components/preview/FlowPreviewStatus.svelte
+++ b/frontend/src/lib/components/preview/FlowPreviewStatus.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { CompletedJob, QueuedJob } from '$lib/gen'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	import JobStatus from '../JobStatus.svelte'
 	import { ExternalLinkIcon } from 'lucide-svelte'
@@ -32,7 +32,7 @@
 				<a
 					rel="noreferrer"
 					target="_blank"
-					href="{base}/run/{job?.id}?workspace={job?.workspace_id}"
+					href="{$wsBase}/run/{job?.id}"
 				>
 					{truncateRev(job?.id, 8)}
 					<ExternalLinkIcon size={14} class="inline mb-1 ml-1" />
diff --git a/frontend/src/lib/components/runs/JobDetailFieldConfig.ts b/frontend/src/lib/components/runs/JobDetailFieldConfig.ts
index 23a7df12cdca2..b6d4478e26eb9 100644
--- a/frontend/src/lib/components/runs/JobDetailFieldConfig.ts
+++ b/frontend/src/lib/components/runs/JobDetailFieldConfig.ts
@@ -3,6 +3,7 @@ import { triggerIconMap } from '$lib/components/triggers/utils'
 import { formatMemory } from '$lib/utils'
 import { Calendar, Bot } from 'lucide-svelte'
 import BarsStaggered from '$lib/components/icons/BarsStaggered.svelte'
+import { getWsBase } from '$lib/workspaceUrl'
 
 /**
  * Categories of job types for field configuration
@@ -217,7 +218,7 @@ export const fieldConfigs: Record<JobField, FieldConfig> = {
 		label: 'Parent',
 		getValue: (job) => job.parent_job || null,
 		getHref: (job, workspaceId) =>
-			job.parent_job ? `/run/${job.parent_job}?workspace=${workspaceId}` : null
+			job.parent_job ? `${getWsBase(workspaceId)}/run/${job.parent_job}` : null
 	},
 
 	schedule_path: {
@@ -232,7 +233,7 @@ export const fieldConfigs: Record<JobField, FieldConfig> = {
 		getValue: (job) => job.script_hash?.toString() || null,
 		getHref: (job, workspaceId) =>
 			job.script_hash && job.job_kind === 'script'
-				? `/scripts/get/${job.script_hash}?workspace=${workspaceId}`
+				? `${getWsBase(workspaceId)}/scripts/get/${job.script_hash}`
 				: null
 	},
 
@@ -244,7 +245,7 @@ export const fieldConfigs: Record<JobField, FieldConfig> = {
 			if (!job.script_path) return null
 			const stem = job.job_kind === 'script' ? 'scripts' : 'flows'
 			const isScript = job.job_kind === 'script'
-			return `/${stem}/get/${isScript ? job.script_hash : job.script_path}`
+			return `${getWsBase(workspaceId)}/${stem}/get/${isScript ? job.script_hash : job.script_path}`
 		}
 	},
 
diff --git a/frontend/src/lib/components/runs/JobDetailHeader.svelte b/frontend/src/lib/components/runs/JobDetailHeader.svelte
index 7ca973dd00900..a1f768ee767a2 100644
--- a/frontend/src/lib/components/runs/JobDetailHeader.svelte
+++ b/frontend/src/lib/components/runs/JobDetailHeader.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { type Job } from '$lib/gen'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { displayDate, truncateRev, truncateHash } from '$lib/utils'
 	import ScheduleEditor from '$lib/components/triggers/schedules/ScheduleEditor.svelte'
 	import TimeAgo from '$lib/components/TimeAgo.svelte'
@@ -189,14 +189,14 @@
 				<Tooltip>
 					{#snippet text()}
 						This job was run on worker:
-						<a href={`${base}/runs/?job_kinds=all&worker=${job?.worker}`}>
+						<a href={`${$wsBase}/runs/?job_kinds=all&worker=${job?.worker}`}>
 							{job?.worker}
 						</a>
 						<br />
 						<WorkerHostname worker={job.worker!} minTs={job?.['created_at']} />
 					{/snippet}
 					<a
-						href={`${base}/runs/?job_kinds=all&worker=${job?.worker}`}
+						href={`${$wsBase}/runs/?job_kinds=all&worker=${job?.worker}`}
 						class="flex items-center gap-1 text-primary"
 					>
 						<span class="truncate flex-shrink min-w-0">{displayValue}</span>
@@ -231,7 +231,7 @@
 				Triggered by
 			{/if}
 			<a
-				href={`${base}/run/${job.parent_job}?workspace=${$workspaceStore}`}
+				href={`${$wsBase}/run/${job.parent_job}`}
 				class="flex items-center gap-1"
 			>
 				{displayValue}
@@ -249,7 +249,7 @@
 						icon: Link,
 						action: () =>
 							navigator.clipboard.writeText(
-								`${window.location.origin}${base}/run/${job.id}?workspace=${job.workspace_id}`
+								`${window.location.origin}${$wsBase}/run/${job.id}`
 							)
 					},
 					{
@@ -300,7 +300,7 @@
 						<span class="text-secondary flex-shrink-0">Job ID</span>
 						<span class="text-primary">
 							<a
-								href={`${base}/run/${job.id}?workspace=${job.workspace_id}`}
+								href={`${$wsBase}/run/${job.id}`}
 								class="flex items-center gap-1 min-w-0"
 							>
 								<span class="truncate flex-shrink min-w-0">{truncateRev(job.id, 8)}</span>
@@ -388,7 +388,7 @@
 							{#if job.script_path && (job.job_kind === 'script' || job.job_kind === 'flow' || job.job_kind === 'singlestepflow')}
 								{@const stem = job.job_kind === 'script' ? 'scripts' : 'flows'}
 								{@const isScript = job.job_kind === 'script'}
-								{@const viewHref = `${base}/${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
+								{@const viewHref = `${$wsBase}/${stem}/get/${isScript ? job?.script_hash : job?.script_path}`}
 								<a
 									href={viewHref}
 									class="text-emphasis {compact
@@ -479,7 +479,7 @@
 								<span class="text-secondary flex-shrink-0">Job ID</span>
 								<span class="text-primary">
 									<a
-										href={`${base}/run/${job.id}?workspace=${job.workspace_id}`}
+										href={`${$wsBase}/run/${job.id}`}
 										class="flex items-center gap-1 min-w-0"
 									>
 										<span class="truncate flex-shrink min-w-0">{truncateRev(job.id, 8)}</span>
diff --git a/frontend/src/lib/components/runs/QueuePopover.svelte b/frontend/src/lib/components/runs/QueuePopover.svelte
index 936fae1041c71..71c0927b64394 100644
--- a/frontend/src/lib/components/runs/QueuePopover.svelte
+++ b/frontend/src/lib/components/runs/QueuePopover.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { JobService, type QueuedJob } from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
+	import { getWsBase } from '$lib/workspaceUrl'
 	import { ExternalLink } from 'lucide-svelte'
 	import Skeleton from '../common/skeleton/Skeleton.svelte'
 	import { displayDate } from '$lib/utils'
@@ -41,7 +42,7 @@
 			<div class="flex">
 				<a
 					target="_blank"
-					href={`/run/${job.id}?workspace=${job.workspace_id}`}
+					href={`${getWsBase(job.workspace_id)}/run/${job.id}`}
 					class="flex flex-row gap-2 items-center font-mono mr-8"
 					>{job.id} <ExternalLink size={10} />
 				</a>
diff --git a/frontend/src/lib/components/runs/RunBadges.svelte b/frontend/src/lib/components/runs/RunBadges.svelte
index 197b93975115a..a2c45656ac0fe 100644
--- a/frontend/src/lib/components/runs/RunBadges.svelte
+++ b/frontend/src/lib/components/runs/RunBadges.svelte
@@ -2,9 +2,8 @@
 	import Tooltip from '$lib/components/meltComponents/Tooltip.svelte'
 	import PreprocessedArgsDisplay from '$lib/components/runs/PreprocessedArgsDisplay.svelte'
 	import { truncateHash } from '$lib/utils'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { truncateRev } from '$lib/utils'
-	import { workspaceStore } from '$lib/stores'
 	import Badge from '$lib/components/common/badge/Badge.svelte'
 	import Button from '$lib/components/common/button/Button.svelte'
 	import { ListFilter } from 'lucide-svelte'
@@ -33,7 +32,7 @@
 
 {#if job.script_hash && showScriptHash && job.job_kind !== 'aiagent'}
 	{#if job.job_kind == 'script'}
-		<a href="{base}/scripts/get/{job.script_hash}?workspace={$workspaceStore}"
+		<a href="{$wsBase}/scripts/get/{job.script_hash}"
 			><Badge color="gray" title={`Script hash: ${job.script_hash}`} {large}
 				>{truncateHash(job.script_hash)}
 			</Badge></a
@@ -104,7 +103,7 @@
 					</Button>
 				{:else}
 					<a
-						href={`${base}/runs/?job_kinds=all&graph=ConcurrencyChart&concurrency_key=${concurrencyKey}`}
+						href={`${$wsBase}/runs/?job_kinds=all&graph=ConcurrencyChart&concurrency_key=${concurrencyKey}`}
 					>
 						{concurrencyKey}
 					</a>
@@ -116,7 +115,7 @@
 				</button>
 			{:else}
 				<a
-					href={`${base}/runs/?job_kinds=all&graph=ConcurrencyChart&concurrency_key=${concurrencyKey}`}
+					href={`${$wsBase}/runs/?job_kinds=all&graph=ConcurrencyChart&concurrency_key=${concurrencyKey}`}
 				>
 					<Badge {large}>Concurrency: {truncateRev(concurrencyKey, 20)}</Badge>
 				</a>
diff --git a/frontend/src/lib/components/runs/RunRow.svelte b/frontend/src/lib/components/runs/RunRow.svelte
index 3a14c71111261..e1137f2da4baf 100644
--- a/frontend/src/lib/components/runs/RunRow.svelte
+++ b/frontend/src/lib/components/runs/RunRow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { goto } from '$lib/navigation'
 	import type { Job } from '$lib/gen'
 	import {
@@ -162,12 +162,12 @@
 							{/if}
 							{#if job && job.is_flow_step && job.parent_job}
 								<br /> Step of flow
-								<a href={`${base}/run/${job.parent_job}?workspace=${job.workspace_id}`}>
+								<a href={`${$wsBase}/run/${job.parent_job}`}>
 									{truncateRev(job.parent_job, 10)}
 								</a>
 							{:else if job && job.parent_job}
 								<br /> Parent
-								<a href={`${base}/run/${job.parent_job}?workspace=${job.workspace_id}`}>
+								<a href={`${$wsBase}/run/${job.parent_job}`}>
 									{truncateRev(job.parent_job, 10)}
 								</a>
 							{/if}
@@ -318,7 +318,7 @@
 		<div class="flex justify-end pr-2">
 			<a
 				target="_blank"
-				href="{base}/run/{job.id}?workspace={job.workspace_id}"
+				href="{$wsBase}/run/{job.id}"
 				class={twMerge(
 					'text-right float-right  px-2',
 					selected ? 'text-accent' : 'text-secondary hover:text-accent'
diff --git a/frontend/src/lib/components/schema/JobSchemaPicker.svelte b/frontend/src/lib/components/schema/JobSchemaPicker.svelte
index 47e6220c798fb..16cfdc6c6bdcd 100644
--- a/frontend/src/lib/components/schema/JobSchemaPicker.svelte
+++ b/frontend/src/lib/components/schema/JobSchemaPicker.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
 	import SchemaPickerRow from './SchemaPickerRow.svelte'
-	import { workspaceStore } from '$lib/stores'
 	import { ExternalLink } from 'lucide-svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	interface Props {
 		job: any
@@ -60,7 +59,7 @@
 			<div class="center-center">
 				<a
 					target="_blank"
-					href="{base}/run/{job.id}?workspace={$workspaceStore}"
+					href="{$wsBase}/run/{job.id}"
 					class="text-right float-right text-secondary px-2"
 					title="See run detail in a new tab"
 				>
diff --git a/frontend/src/lib/components/schema/RunningJobSchemaPicker.svelte b/frontend/src/lib/components/schema/RunningJobSchemaPicker.svelte
index 4e2a503d8485e..979bbdb376516 100644
--- a/frontend/src/lib/components/schema/RunningJobSchemaPicker.svelte
+++ b/frontend/src/lib/components/schema/RunningJobSchemaPicker.svelte
@@ -5,7 +5,7 @@
 	import { workspaceStore } from '$lib/stores'
 	import { createEventDispatcher, untrack } from 'svelte'
 	import { ExternalLink } from 'lucide-svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { Cell, Row } from '$lib/components/table'
 	import { twMerge } from 'tailwind-merge'
 
@@ -75,7 +75,7 @@
 					<div class="center-center {hovering ? '' : '!hidden'}">
 						<a
 							target="_blank"
-							href="{base}/run/{job.id}?workspace={$workspaceStore}"
+							href="{$wsBase}/run/{job.id}"
 							class="text-right float-right text-secondary"
 							title="See run detail in a new tab"
 						>
diff --git a/frontend/src/lib/components/scriptEditor/LogPanel.svelte b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
index 82845c4a88e98..5d7dcb5dea3ef 100644
--- a/frontend/src/lib/components/scriptEditor/LogPanel.svelte
+++ b/frontend/src/lib/components/scriptEditor/LogPanel.svelte
@@ -10,7 +10,7 @@
 		type WorkflowStatus
 	} from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { displayDate } from '$lib/utils'
 	import Tabs from '../common/tabs/Tabs.svelte'
 	import Tab from '../common/tabs/Tab.svelte'
@@ -244,7 +244,7 @@
 										<Cell first>
 											<a
 												class="pr-3"
-												href="{base}/run/{id}?workspace={workspace ?? $workspaceStore}"
+												href="{$wsBase}/run/{id}"
 												target="_blank">{id.substring(30)}</a
 											>
 										</Cell>
diff --git a/frontend/src/lib/components/scripts/CreateActionsScript.svelte b/frontend/src/lib/components/scripts/CreateActionsScript.svelte
index 48480918e086c..d6447dd1a19b7 100644
--- a/frontend/src/lib/components/scripts/CreateActionsScript.svelte
+++ b/frontend/src/lib/components/scripts/CreateActionsScript.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { Code2, Plus } from 'lucide-svelte'
 	import { Button } from '$lib/components/common'
 
@@ -14,7 +14,7 @@
 		unifiedSize="lg"
 		variant="accent"
 		startIcon={{ icon: Plus }}
-		href="{base}/scripts/add"
+		href="{$wsBase}/scripts/add"
 		endIcon={{ icon: Code2 }}
 	>
 		Script
diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index 3fa32d6db9bb5..f5690139694a2 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -32,7 +32,8 @@
 
 	import { twMerge } from 'tailwind-merge'
 	import ContentSearchInner from '../ContentSearchInner.svelte'
-	import { goto } from '$app/navigation'
+	import { goto } from '$lib/navigation'
+	import { toWorkspacePath } from '$lib/workspaceUrl'
 	import QuickMenuItem from '../search/QuickMenuItem.svelte'
 	import { devopsRole, enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
 	import uFuzzy from '@leeoniya/ufuzzy'
@@ -420,7 +421,7 @@
 			open = false
 			goto(path)
 		} else {
-			window.open(path, '_blank')
+			window.open(toWorkspacePath(path), '_blank')
 		}
 	}
 
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
index f8418b048aa18..5cb9bf12f32cb 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
@@ -18,7 +18,7 @@
 	import List from '$lib/components/common/layout/List.svelte'
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { BellOff, Bell, ExternalLink, Settings } from 'lucide-svelte'
-	import { base } from '$lib/base'
+	import { wsBase, getWsBase } from '$lib/workspaceUrl'
 	import Notification from '$lib/components/common/alert/Notification.svelte'
 
 	interface Props {
@@ -262,7 +262,7 @@
 								<Button
 									size="xs"
 									color="light"
-									href="{base}/?workspace=admins#superadmin-settings"
+									href="{getWsBase('admins')}/#superadmin-settings"
 									target="_blank"
 								>
 									<div class="w-full">
@@ -277,7 +277,7 @@
 								<Button
 									size="xs"
 									color="light"
-									href="{base}/workspace_settings?tab=error_handler"
+									href="{$wsBase}/workspace_settings?tab=error_handler"
 									target="_blank"
 								>
 									Workspace Critical Alert Settings <ExternalLink size="16" />
@@ -290,7 +290,7 @@
 				<Button
 					size="xs"
 					variant="default"
-					href="{base}/workspace_settings?tab=error_handler"
+					href="{$wsBase}/workspace_settings?tab=error_handler"
 					target="_blank"
 				>
 					<List horizontal justify="between" gap="sm">
diff --git a/frontend/src/lib/components/sidebar/FavoriteMenu.svelte b/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
index 056bca14893ec..43747de578192 100644
--- a/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
+++ b/frontend/src/lib/components/sidebar/FavoriteMenu.svelte
@@ -1,15 +1,18 @@
 <script module lang="ts">
+	import { getWsBase } from '$lib/workspaceUrl'
+
 	export type FavoriteKind = Exclude<
 		NonNullable<StarData['requestBody']>['favorite_kind'],
 		undefined
 	>
 
 	export function getFavoriteHref(path: string, kind: FavoriteKind) {
+		const wsPrefix = getWsBase()
 		return {
-			script: `/scripts/get/${path}`,
-			flow: `/flows/get/${path}`,
-			app: `/apps/get/${path}`,
-			raw_app: `/apps_raw/get/${path}`,
+			script: `${wsPrefix}/scripts/get/${path}`,
+			flow: `${wsPrefix}/flows/get/${path}`,
+			app: `${wsPrefix}/apps/get/${path}`,
+			raw_app: `${wsPrefix}/apps_raw/get/${path}`,
 			asset: '#'
 		}[kind]
 	}
diff --git a/frontend/src/lib/components/sidebar/MenuLink.svelte b/frontend/src/lib/components/sidebar/MenuLink.svelte
index b9d841f729b58..eaf242b50e549 100644
--- a/frontend/src/lib/components/sidebar/MenuLink.svelte
+++ b/frontend/src/lib/components/sidebar/MenuLink.svelte
@@ -3,7 +3,6 @@
 	import type { MenubarMenuElements } from '@melt-ui/svelte'
 	import { navigating, page } from '$app/stores'
 	import Popover from '../Popover.svelte'
-	import { base } from '$app/paths'
 	import { triggerableByAI } from '$lib/actions/triggerableByAI.svelte'
 	import { goto } from '$app/navigation'
 	import { twMerge } from 'tailwind-merge'
@@ -40,7 +39,7 @@
 	let isSelected = $state(false)
 
 	navigating.subscribe(() => {
-		if (href === `${base}/`) {
+		if (href.endsWith('/')) {
 			isSelected = $page.url.pathname === href
 		} else {
 			isSelected = $page.url.pathname.startsWith(href)
diff --git a/frontend/src/lib/components/sidebar/OperatorMenu.svelte b/frontend/src/lib/components/sidebar/OperatorMenu.svelte
index d30408d220d89..435fbde26170c 100644
--- a/frontend/src/lib/components/sidebar/OperatorMenu.svelte
+++ b/frontend/src/lib/components/sidebar/OperatorMenu.svelte
@@ -16,6 +16,7 @@
 		Table2
 	} from 'lucide-svelte'
 	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	import MultiplayerMenu from './MultiplayerMenu.svelte'
 	import {
@@ -52,16 +53,16 @@
 
 	let mainMenuLinks = $derived(
 		[
-			{ label: 'Home', id: 'home', href: `${base}/`, icon: Home },
-			{ label: 'Runs', id: 'runs', href: `${base}/runs`, icon: Play },
-			{ label: 'Schedules', id: 'schedules', href: `${base}/schedules`, icon: Calendar },
+			{ label: 'Home', id: 'home', href: `${$wsBase}/`, icon: Home },
+			{ label: 'Runs', id: 'runs', href: `${$wsBase}/runs`, icon: Play },
+			{ label: 'Schedules', id: 'schedules', href: `${$wsBase}/schedules`, icon: Calendar },
 			// Add Tutorials to main menu only if not all completed and not skipped
 			...($tutorialsToDo.length > 0 && !$skippedAll
 				? [
 						{
 							label: 'Tutorials',
 							id: 'tutorials',
-							href: `${base}/tutorials`,
+							href: `${$wsBase}/tutorials`,
 							icon: GraduationCap
 						}
 					]
@@ -88,32 +89,32 @@
 			{
 				label: 'Resources',
 				id: 'resources',
-				href: `${base}/resources`
+				href: `${$wsBase}/resources`
 			},
 			{
 				label: 'Variables',
 				id: 'variables',
-				href: `${base}/variables`
+				href: `${$wsBase}/variables`
 			},
 			{
 				label: 'Assets',
 				id: 'assets',
-				href: `${base}/assets`
+				href: `${$wsBase}/assets`
 			},
 			{
 				label: 'Groups',
 				id: 'groups',
-				href: `${base}/groups`
+				href: `${$wsBase}/groups`
 			},
 			{
 				label: 'Folders',
 				id: 'folders',
-				href: `${base}/folders`
+				href: `${$wsBase}/folders`
 			},
 			{
 				label: 'Workers',
 				id: 'workers',
-				href: `${base}/workers`
+				href: `${$wsBase}/workers`
 			}
 		].filter(filterLink)
 	)
@@ -122,52 +123,52 @@
 			{
 				label: 'Custom HTTP routes',
 				id: 'triggers',
-				href: `${base}/routes`
+				href: `${$wsBase}/routes`
 			},
 			{
 				label: 'Websocket triggers',
 				id: 'triggers',
-				href: `${base}/websocket_triggers`
+				href: `${$wsBase}/websocket_triggers`
 			},
 			{
 				label: 'Postgres triggers',
 				id: 'triggers',
-				href: `${base}/postgres_triggers`
+				href: `${$wsBase}/postgres_triggers`
 			},
 			{
 				label: 'Kafka triggers',
 				id: 'triggers',
-				href: `${base}/kafka_triggers`
+				href: `${$wsBase}/kafka_triggers`
 			},
 			{
 				label: 'NATS triggers',
 				id: 'triggers',
-				href: `${base}/nats_triggers`
+				href: `${$wsBase}/nats_triggers`
 			},
 			{
 				label: 'SQS triggers',
 				id: 'triggers',
-				href: `${base}/sqs_triggers`
+				href: `${$wsBase}/sqs_triggers`
 			},
 			{
 				label: 'GCP Pub/Sub triggers',
 				id: 'triggers',
-				href: `${base}/gcp_triggers`
+				href: `${$wsBase}/gcp_triggers`
 			},
 			{
 				label: 'MQTT triggers',
 				id: 'triggers',
-				href: `${base}/mqtt_triggers`
+				href: `${$wsBase}/mqtt_triggers`
 			},
 			{
 				label: 'Email triggers',
 				id: 'triggers',
-				href: `${base}/email_triggers`
+				href: `${$wsBase}/email_triggers`
 			},
 			{
 				label: 'Audit logs',
 				id: 'audit_logs',
-				href: `${base}/audit_logs`
+				href: `${$wsBase}/audit_logs`
 			}
 		].filter(filterLink)
 	)
diff --git a/frontend/src/lib/components/sidebar/SidebarContent.svelte b/frontend/src/lib/components/sidebar/SidebarContent.svelte
index b0382158bfe2b..79823bf421e89 100644
--- a/frontend/src/lib/components/sidebar/SidebarContent.svelte
+++ b/frontend/src/lib/components/sidebar/SidebarContent.svelte
@@ -50,7 +50,7 @@
 	import ConfirmationModal from '../common/confirmationModal/ConfirmationModal.svelte'
 	import { twMerge } from 'tailwind-merge'
 	import { onMount } from 'svelte'
-	import { base } from '$lib/base'
+	import { wsBase, stripWsPrefix } from '$lib/workspaceUrl'
 	import { type Changelog, changelogs } from './changelogs'
 	import { page } from '$app/state'
 	import SideBarNotification from './SideBarNotification.svelte'
@@ -140,7 +140,7 @@
 			subItems: [
 				{
 					label: 'Tutorials',
-					href: `${base}/tutorials`,
+					href: `${$wsBase}/tutorials`,
 					icon: GraduationCap,
 					aiId: 'sidebar-menu-link-tutorials',
 					aiDescription: 'Button to navigate to tutorials',
@@ -206,7 +206,7 @@
 	let mainMenuLinks = $derived([
 		{
 			label: 'Home',
-			href: `${base}/`,
+			href: `${$wsBase}/`,
 			icon: Home,
 			aiId: 'sidebar-menu-link-home',
 			aiDescription:
@@ -214,7 +214,7 @@
 		},
 		{
 			label: 'Runs',
-			href: `${base}/runs`,
+			href: `${$wsBase}/runs`,
 			icon: Play,
 			aiId: 'sidebar-menu-link-runs',
 			aiDescription: 'Button to navigate to runs',
@@ -226,7 +226,7 @@
 		},
 		{
 			label: 'Variables',
-			href: `${base}/variables`,
+			href: `${$wsBase}/variables`,
 			icon: DollarSign,
 			disabled: $userStore?.operator,
 			aiId: 'sidebar-menu-link-variables',
@@ -234,7 +234,7 @@
 		},
 		{
 			label: 'Resources',
-			href: `${base}/resources`,
+			href: `${$wsBase}/resources`,
 			icon: Boxes,
 			disabled: $userStore?.operator,
 			aiId: 'sidebar-menu-link-resources',
@@ -242,7 +242,7 @@
 		},
 		{
 			label: 'Assets',
-			href: `${base}/assets`,
+			href: `${$wsBase}/assets`,
 			icon: Pyramid,
 			disabled: $userStore?.operator,
 			aiId: 'sidebar-menu-link-assets',
@@ -253,7 +253,7 @@
 			? [
 					{
 						label: 'Tutorials',
-						href: `${base}/tutorials`,
+						href: `${$wsBase}/tutorials`,
 						icon: GraduationCap,
 						aiId: 'sidebar-menu-link-tutorials-main',
 						aiDescription: 'Button to navigate to tutorials'
@@ -264,7 +264,7 @@
 	let defaultExtraTriggerLinks = $derived([
 		{
 			label: 'HTTP',
-			href: '/routes',
+			href: `${$wsBase}/routes`,
 			icon: Route,
 			disabled: $userStore?.operator,
 			kind: 'http',
@@ -273,7 +273,7 @@
 		},
 		{
 			label: 'WebSockets',
-			href: '/websocket_triggers',
+			href: `${$wsBase}/websocket_triggers`,
 			icon: Unplug,
 			disabled: $userStore?.operator,
 			kind: 'ws',
@@ -282,7 +282,7 @@
 		},
 		{
 			label: 'Postgres',
-			href: '/postgres_triggers',
+			href: `${$wsBase}/postgres_triggers`,
 			icon: Database,
 			disabled: $userStore?.operator,
 			kind: 'postgres',
@@ -291,7 +291,7 @@
 		},
 		{
 			label: 'Kafka' + ($enterpriseLicense ? '' : ' (EE)'),
-			href: '/kafka_triggers',
+			href: `${$wsBase}/kafka_triggers`,
 			icon: KafkaIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
 			kind: 'kafka',
@@ -300,7 +300,7 @@
 		},
 		{
 			label: 'NATS' + ($enterpriseLicense ? '' : ' (EE)'),
-			href: '/nats_triggers',
+			href: `${$wsBase}/nats_triggers`,
 			icon: NatsIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
 			kind: 'nats',
@@ -309,7 +309,7 @@
 		},
 		{
 			label: 'SQS' + ($enterpriseLicense ? '' : ' (EE)'),
-			href: '/sqs_triggers',
+			href: `${$wsBase}/sqs_triggers`,
 			icon: AwsIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
 			kind: 'sqs',
@@ -318,7 +318,7 @@
 		},
 		{
 			label: 'GCP Pub/Sub' + ($enterpriseLicense ? '' : ' (EE)'),
-			href: '/gcp_triggers',
+			href: `${$wsBase}/gcp_triggers`,
 			icon: GoogleCloudIcon,
 			disabled: $userStore?.operator || !$enterpriseLicense,
 			kind: 'gcp',
@@ -327,7 +327,7 @@
 		},
 		{
 			label: 'MQTT',
-			href: '/mqtt_triggers',
+			href: `${$wsBase}/mqtt_triggers`,
 			icon: MqttIcon,
 			disabled: $userStore?.operator,
 			kind: 'mqtt',
@@ -336,7 +336,7 @@
 		},
 		{
 			label: 'Email',
-			href: '/email_triggers',
+			href: `${$wsBase}/email_triggers`,
 			icon: MailIcon,
 			disabled: $userStore?.operator,
 			kind: 'email',
@@ -348,7 +348,7 @@
 	let nativeTriggerLinks = $derived(
 		availableNativeServices.map(({ service, icon, config }) => ({
 			label: config?.serviceDisplayName || service,
-			href: `/native_triggers/${service}`,
+			href: `${$wsBase}/native_triggers/${service}`,
 			icon: icon,
 			disabled: $userStore?.operator,
 			kind: service,
@@ -359,22 +359,28 @@
 
 	let allTriggerLinks = $derived([...defaultExtraTriggerLinks, ...nativeTriggerLinks])
 
+	let strippedPathname = $derived(stripWsPrefix(page.url.pathname))
 	let triggerMenuLinks = $derived([
 		{
 			label: 'Schedules',
-			href: `${base}/schedules`,
+			href: `${$wsBase}/schedules`,
 			icon: Calendar,
 			disabled: !SIDEBAR_SHOW_SCHEDULES || $userStore?.operator,
 			aiId: 'sidebar-menu-link-schedules',
 			aiDescription: 'Button to navigate to schedules'
 		},
 		...allTriggerLinks.filter(
-			(link) => $usedTriggerKinds.includes(link.kind) || page.url.pathname.includes(link.href)
+			(link) =>
+				$usedTriggerKinds.includes(link.kind) ||
+				strippedPathname.includes(stripWsPrefix(link.href))
 		)
 	])
 	let extraTriggerLinks = $derived(
 		allTriggerLinks.filter((link) => {
-			return !page.url.pathname.includes(link.href) && !$usedTriggerKinds.includes(link.kind)
+			return (
+				!strippedPathname.includes(stripWsPrefix(link.href)) &&
+				!$usedTriggerKinds.includes(link.kind)
+			)
 		})
 	)
 	let secondaryMenuLinks = $derived([
@@ -403,7 +409,7 @@
 					? [
 							{
 								label: 'Workspace',
-								href: `${base}/workspace_settings`,
+								href: `${$wsBase}/workspace_settings`,
 								icon: FolderCog,
 								aiId: 'sidebar-menu-link-workspace',
 								aiDescription: 'Button to navigate to workspace settings',
@@ -453,7 +459,7 @@
 		},
 		{
 			label: 'Workers',
-			href: `${base}/workers`,
+			href: `${$wsBase}/workers`,
 			icon: ServerCog,
 			disabled: $userStore?.operator,
 			aiId: 'sidebar-menu-link-workers',
@@ -467,7 +473,7 @@
 			subItems: [
 				{
 					label: 'Folders',
-					href: `${base}/folders`,
+					href: `${$wsBase}/folders`,
 					icon: FolderOpen,
 					disabled: $userStore?.operator,
 					aiId: 'sidebar-menu-link-folders',
@@ -476,7 +482,7 @@
 				},
 				{
 					label: 'Groups',
-					href: `${base}/groups`,
+					href: `${$wsBase}/groups`,
 					icon: UserCog,
 					disabled: $userStore?.operator,
 					aiId: 'sidebar-menu-link-groups',
@@ -495,7 +501,7 @@
 					subItems: [
 						{
 							label: 'Audit logs',
-							href: `${base}/audit_logs`,
+							href: `${$wsBase}/audit_logs`,
 							icon: Eye,
 							aiId: 'sidebar-menu-link-audit-logs',
 							aiDescription: 'Button to navigate to audit logs'
@@ -504,7 +510,7 @@
 							? [
 									{
 										label: 'Service logs',
-										href: `${base}/service_logs`,
+										href: `${$wsBase}/service_logs`,
 										icon: Logs,
 										aiId: 'sidebar-menu-link-service-logs',
 										aiDescription: 'Button to navigate to service logs'
@@ -529,7 +535,7 @@
 				}
 			: {
 					label: 'Audit logs',
-					href: `${base}/audit_logs`,
+					href: `${$wsBase}/audit_logs`,
 					icon: Eye,
 					disabled: $userStore?.operator,
 					aiId: 'sidebar-menu-link-audit-logs',
diff --git a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
index 3349b9223322b..b6de47b6e9d91 100644
--- a/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
+++ b/frontend/src/lib/components/sidebar/WorkspaceMenu.svelte
@@ -18,6 +18,7 @@
 	import { base } from '$lib/base'
 	import { page } from '$app/state'
 	import { switchWorkspace } from '$lib/storeUtils'
+	import { stripWsPrefix, wsBase } from '$lib/workspaceUrl'
 	import MultiplayerMenu from './MultiplayerMenu.svelte'
 	import { enterpriseLicense } from '$lib/stores'
 	import { isCloudHosted } from '$lib/cloud'
@@ -58,14 +59,13 @@
 		]
 		const isOnEditPage = editPages.some((editPage) => page.route.id?.includes(editPage) ?? false)
 
-		if (!isOnEditPage) {
-			switchWorkspace(id)
-			if (page.url.searchParams.get('workspace')) {
-				page.url.searchParams.set('workspace', id)
-			}
-		} else {
-			switchWorkspace(id)
+		switchWorkspace(id)
+		if (isOnEditPage) {
 			await goto('/')
+		} else {
+			// Stay on same page in new workspace
+			const strippedPath = stripWsPrefix(page.url.pathname)
+			await goto(strippedPath)
 		}
 	}
 
@@ -200,7 +200,7 @@
 			{/if}
 			{#if ($userStore?.is_admin || $superadmin) && !strictWorkspaceSelect}
 				<div class="py-1" role="none">
-					<MenuItem href="{base}/workspace_settings" class={itemClass} {item}>
+					<MenuItem href="{$wsBase}/workspace_settings" class={itemClass} {item}>
 						<Settings size={16} />
 						Workspace settings
 					</MenuItem>
diff --git a/frontend/src/lib/components/triggers/TriggerSuspendedJobsModal.svelte b/frontend/src/lib/components/triggers/TriggerSuspendedJobsModal.svelte
index 2985a38fdb134..37fa09c962b1b 100644
--- a/frontend/src/lib/components/triggers/TriggerSuspendedJobsModal.svelte
+++ b/frontend/src/lib/components/triggers/TriggerSuspendedJobsModal.svelte
@@ -38,6 +38,7 @@
 		errorHandlerArgs,
 		slackErrorHandlerHubPathEnding
 	} from '../ErrorOrRecoveryHandler.svelte'
+	import { toWorkspacePath } from '$lib/workspaceUrl'
 
 	type Props = {
 		triggerPath: string
@@ -430,7 +431,7 @@
 
 							<Row
 								hoverable
-								on:click={() => window.open(`/run/${job.id}?workspace=${workspace}`, '_blank')}
+								on:click={() => window.open(toWorkspacePath(`/run/${job.id}`, workspace), '_blank')}
 							>
 								<Cell class="w-12 sm:pl-3" shouldStopPropagation>
 									<div class="h-4 w-4">
diff --git a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
index a4f460d96bf32..9d500acdc7f29 100644
--- a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
@@ -30,7 +30,7 @@
 	import RelationPicker from './RelationPicker.svelte'
 	import { invalidRelations, savePostgresTriggerFromCfg } from './utils'
 	import CheckPostgresRequirement from './CheckPostgresRequirement.svelte'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { untrack, type Snippet } from 'svelte'
 	import TriggerEditorToolbar from '../TriggerEditorToolbar.svelte'
 	import PermissionedAsLine from '../PermissionedAsLine.svelte'
@@ -431,7 +431,7 @@
 					postgres_resource_path
 				}
 			})
-			window.open(`${base}/scripts/add?id=${templateId}`)
+			window.open(`${$wsBase}/scripts/add?id=${templateId}`)
 			loading = false
 		} catch (error) {
 			loading = false
diff --git a/frontend/src/lib/components/triggers/scheduled/utils.ts b/frontend/src/lib/components/triggers/scheduled/utils.ts
index a0a1b8daad5b5..7372e9dc39af0 100644
--- a/frontend/src/lib/components/triggers/scheduled/utils.ts
+++ b/frontend/src/lib/components/triggers/scheduled/utils.ts
@@ -1,5 +1,6 @@
 import { JobService, ScheduleService } from "$lib/gen"
 import { sendUserToast } from "$lib/utils"
+import { toWorkspacePath } from "$lib/workspaceUrl"
 
 export async function runScheduleNow(
     path: string,
@@ -24,7 +25,7 @@ export async function runScheduleNow(
         sendUserToast(`Schedule ${path} will run now`, false, [
             {
                 label: 'Go to the run page',
-                callback: () => window.open('/run/' + run + '?workspace=' + workspace_id, '_blank')
+                callback: () => window.open(toWorkspacePath('/run/' + run, workspace_id), '_blank')
             }
         ])
     } catch (err) {
diff --git a/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte b/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
index b8d4ee59f9494..887485e35e234 100644
--- a/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
@@ -24,7 +24,7 @@
 	} from '$lib/gen'
 	import { enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
 	import { canWrite, emptyString, formatCron, sendUserToast, cronV1toV2 } from '$lib/utils'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import Section from '$lib/components/Section.svelte'
 	import { List, Loader2, Save, AlertTriangle } from 'lucide-svelte'
 	import autosize from '$lib/autosize'
@@ -664,7 +664,7 @@
 							variant="default"
 							startIcon={{ icon: List }}
 							disabled={!allowSchedule || pathError != '' || emptyString(script_path)}
-							href={`${base}/runs/${script_path}?show_schedules=true&show_future_jobs=true`}
+							href={`${$wsBase}/runs/${script_path}?show_schedules=true&show_future_jobs=true`}
 						>
 							View runs
 						</Button>
diff --git a/frontend/src/lib/components/workspaceSettings/CreateWorkspace.svelte b/frontend/src/lib/components/workspaceSettings/CreateWorkspace.svelte
index e02facb38eeba..a7e65a4c73284 100644
--- a/frontend/src/lib/components/workspaceSettings/CreateWorkspace.svelte
+++ b/frontend/src/lib/components/workspaceSettings/CreateWorkspace.svelte
@@ -18,6 +18,7 @@
 	import { logoutWithRedirect } from '$lib/logoutKit'
 	import { page } from '$app/state'
 	import { usersWorkspaceStore, workspaceStore } from '$lib/stores'
+	import { wsBase } from '$lib/workspaceUrl'
 	import CenteredModal from '$lib/components/CenteredModal.svelte'
 	import { Button } from '$lib/components/common'
 	import Toggle from '$lib/components/Toggle.svelte'
@@ -454,7 +455,7 @@
 									<a
 										target="_blank"
 										class="underline"
-										href={`/run/${job.id}?workspace=${$workspaceStore}`}
+										href={`${$wsBase}/run/${job.id}`}
 									>
 										{job.id}
 									</a>
@@ -479,7 +480,7 @@
 									<a
 										target="_blank"
 										class="underline"
-										href={`/run/${jobId}?workspace=${$workspaceStore}`}
+										href={`${$wsBase}/run/${jobId}`}
 									>
 										{jobId}
 									</a>
diff --git a/frontend/src/lib/navigation.ts b/frontend/src/lib/navigation.ts
index 96545718b2b75..93bd43fac19a8 100644
--- a/frontend/src/lib/navigation.ts
+++ b/frontend/src/lib/navigation.ts
@@ -1,13 +1,19 @@
 import { goto as svelteGoto } from '$app/navigation'
 import { base as svelteBase } from '$app/paths'
+import { toWorkspacePath } from './workspaceUrl'
 
 export function goto(path: string, options = {}) {
-	if (svelteBase == '' || path.startsWith('?')) {
+	if (path.startsWith('?') || path.startsWith('#')) {
 		return svelteGoto(path, options)
-	} else {
-		const fullPath = path.startsWith(svelteBase) ? path : `${svelteBase}${path}`
-		return svelteGoto(fullPath, options)
 	}
+
+	let fullPath = toWorkspacePath(path)
+
+	if (svelteBase && !fullPath.startsWith(svelteBase)) {
+		fullPath = `${svelteBase}${fullPath}`
+	}
+
+	return svelteGoto(fullPath, options)
 }
 
 export async function setQuery(
diff --git a/frontend/src/lib/scripts.ts b/frontend/src/lib/scripts.ts
index e9f2328b716a8..6f17fb8f8fa41 100644
--- a/frontend/src/lib/scripts.ts
+++ b/frontend/src/lib/scripts.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { base } from '$lib/base'
+import { getWsBase } from '$lib/workspaceUrl'
 import type { Schema, SupportedLanguage } from './common'
 import { FlowService, type Script, ScriptService, ScheduleService } from './gen'
 import { workspaceStore } from './stores'
@@ -125,7 +125,7 @@ export function scriptPathToHref(path: string, hubBaseUrl: string): string {
 	if (path.startsWith('hub/')) {
 		return hubBaseUrl + '/from_version/' + path.substring(4)
 	} else {
-		return `${base}/scripts/get/${path}?workspace=${get(workspaceStore)}`
+		return `${getWsBase()}/scripts/get/${path}`
 	}
 }
 
diff --git a/frontend/src/lib/utils/editInFork.ts b/frontend/src/lib/utils/editInFork.ts
index 2a0768694d1d6..4bdf15809bf3c 100644
--- a/frontend/src/lib/utils/editInFork.ts
+++ b/frontend/src/lib/utils/editInFork.ts
@@ -1,21 +1,23 @@
 import { base } from '$lib/base'
+import { getWsBase } from '$lib/workspaceUrl'
 
 type ItemType = 'script' | 'flow' | 'app' | 'raw_app'
 
 export function buildForkEditUrl(itemType: ItemType, itemPath: string): string {
+	const wsBase = getWsBase()
 	let editPath: string
 	switch (itemType) {
 		case 'script':
-			editPath = `${base}/scripts/edit/${itemPath}`
+			editPath = `${wsBase}/scripts/edit/${itemPath}`
 			break
 		case 'flow':
-			editPath = `${base}/flows/edit/${itemPath}?nodraft=true`
+			editPath = `${wsBase}/flows/edit/${itemPath}?nodraft=true`
 			break
 		case 'app':
-			editPath = `${base}/apps/edit/${itemPath}?nodraft=true`
+			editPath = `${wsBase}/apps/edit/${itemPath}?nodraft=true`
 			break
 		case 'raw_app':
-			editPath = `${base}/apps_raw/edit/${itemPath}?nodraft=true`
+			editPath = `${wsBase}/apps_raw/edit/${itemPath}?nodraft=true`
 			break
 	}
 	return `${base}/user/fork_workspace?rd=${encodeURIComponent(editPath)}`
diff --git a/frontend/src/lib/workspaceUrl.ts b/frontend/src/lib/workspaceUrl.ts
new file mode 100644
index 0000000000000..ab9aa2b2e0fa4
--- /dev/null
+++ b/frontend/src/lib/workspaceUrl.ts
@@ -0,0 +1,64 @@
+import { derived, get } from 'svelte/store'
+import { workspaceStore } from './stores'
+import { base } from './base'
+
+const GLOBAL_PATH_PREFIXES = [
+	'/user/',
+	'/oauth/',
+	'/approve/',
+	'/public/',
+	'/a/',
+	'/api/',
+	'/view_graph',
+	'/kitchen_sink',
+	'/gh_success',
+	'/test_dev',
+	'/dev'
+]
+
+/** Extract workspace ID from a URL pathname matching `/w/<workspace>/...` */
+export function extractWorkspaceFromPath(pathname: string): string | undefined {
+	const stripped = base && pathname.startsWith(base) ? pathname.slice(base.length) : pathname
+	const match = stripped.match(/^\/w\/([^/]+)/)
+	return match?.[1]
+}
+
+/** Strip `/w/<workspace>` prefix from a pathname, returning the rest */
+export function stripWsPrefix(pathname: string): string {
+	const stripped = base && pathname.startsWith(base) ? pathname.slice(base.length) : pathname
+	const match = stripped.match(/^\/w\/[^/]+(\/.*)?$/)
+	if (match) {
+		return match[1] || '/'
+	}
+	return stripped
+}
+
+/** Returns true if the path is global (not workspace-scoped) */
+export function isGlobalPath(path: string): boolean {
+	if (path.startsWith('?') || path.startsWith('#')) return true
+	const stripped = base && path.startsWith(base) ? path.slice(base.length) : path
+	// Already has /w/ prefix
+	if (stripped.match(/^\/w\/[^/]+/)) return true
+	return GLOBAL_PATH_PREFIXES.some((prefix) => stripped.startsWith(prefix))
+}
+
+/** Prepend `/w/<workspace>` to a workspace-scoped path */
+export function toWorkspacePath(path: string, workspace?: string): string {
+	if (isGlobalPath(path)) return path
+	const ws = workspace ?? get(workspaceStore)
+	if (!ws) return path
+	return `/w/${ws}${path}`
+}
+
+/** Reactive store: `base + '/w/' + workspace` for use in `<a href>` attributes */
+export const wsBase = derived(workspaceStore, ($ws) => {
+	if (!$ws) return base
+	return `${base}/w/${$ws}`
+})
+
+/** Imperative getter: returns `base + '/w/' + workspace` synchronously */
+export function getWsBase(workspace?: string): string {
+	const ws = workspace ?? get(workspaceStore)
+	if (!ws) return base
+	return `${base}/w/${ws}`
+}
diff --git a/frontend/src/routes/(root)/(logged)/+layout.svelte b/frontend/src/routes/(root)/(logged)/+layout.svelte
index b384b11a1e466..63e36cb1ecf94 100644
--- a/frontend/src/routes/(root)/(logged)/+layout.svelte
+++ b/frontend/src/routes/(root)/(logged)/+layout.svelte
@@ -56,6 +56,7 @@
 	import GlobalSearchModal from '$lib/components/search/GlobalSearchModal.svelte'
 	import MenuButton from '$lib/components/sidebar/MenuButton.svelte'
 	import { loadProtectionRules } from '$lib/workspaceProtectionRules.svelte'
+	import { extractWorkspaceFromPath, stripWsPrefix, isGlobalPath } from '$lib/workspaceUrl'
 	import { setContext, untrack } from 'svelte'
 	import { base } from '$app/paths'
 	import { Menubar } from '$lib/components/meltComponents'
@@ -107,14 +108,34 @@
 	}
 
 	function onQueryChange() {
+		// Extract workspace from URL path /w/<workspace>/...
+		const wsFromUrl = extractWorkspaceFromPath(page.url.pathname)
+		if (wsFromUrl && wsFromUrl !== $workspaceStore) {
+			$workspaceStore = wsFromUrl
+		}
+
+		// Backward compat: support ?workspace=X query param, redirect to /w/X/...
 		let queryWorkspace = page.url.searchParams.get('workspace')
-		if (queryWorkspace) {
+		if (queryWorkspace && !wsFromUrl) {
 			$workspaceStore = queryWorkspace
+			const strippedPath = stripWsPrefix(page.url.pathname)
+			goto(`${strippedPath}${page.url.search.replace(/[?&]workspace=[^&]+/, '')}`, {
+				replaceState: true
+			})
+			return
+		}
+
+		// Redirect old URLs (no /w/ prefix) to new format
+		if (!wsFromUrl && $workspaceStore && !isGlobalPath(page.url.pathname)) {
+			const strippedPath = stripWsPrefix(page.url.pathname)
+			goto(`${strippedPath}${page.url.search}`, { replaceState: true })
+			return
 		}
 
+		const strippedPathname = stripWsPrefix(page.url.pathname)
 		menuHidden =
 			page.url.searchParams.get('nomenubar') === 'true' ||
-			page.url.pathname.startsWith('/oauth/callback/')
+			strippedPathname.startsWith('/oauth/callback/')
 	}
 
 	async function updateUserStore(workspace: string | undefined) {
@@ -144,8 +165,12 @@
 		// This ensures the cross-origin isolation headers are fetched from the server
 		// which are required for SharedArrayBuffer and TypeScript workers to work correctly
 		const toPath = navigation.to?.url.pathname
+			? stripWsPrefix(navigation.to.url.pathname)
+			: undefined
 		if (toPath && (toPath.startsWith('/apps_raw/add') || toPath.startsWith('/apps_raw/edit'))) {
 			const currentPath = navigation.from?.url.pathname
+				? stripWsPrefix(navigation.from.url.pathname)
+				: undefined
 			// Reload if we're not on an apps_raw path, or if we're on /apps/get_raw/ (viewing a raw app)
 			// The /apps/get_raw/ path doesn't have cross-origin isolation headers, so we need to reload
 			if (!currentPath?.startsWith('/apps_raw/') || currentPath?.startsWith('/apps_raw/get/')) {
@@ -295,12 +320,13 @@
 
 	function pathInAppMode(pathname: string | undefined): boolean {
 		if (!pathname) return false
+		const stripped = stripWsPrefix(pathname)
 		return (
-			pathname.startsWith(base + '/apps') ||
-			pathname.startsWith(base + '/flows/add') ||
-			pathname.startsWith(base + '/flows/edit') ||
-			pathname.startsWith(base + '/scripts/add') ||
-			pathname.startsWith(base + '/scripts/edit')
+			stripped.startsWith(base + '/apps') ||
+			stripped.startsWith(base + '/flows/add') ||
+			stripped.startsWith(base + '/flows/edit') ||
+			stripped.startsWith(base + '/scripts/add') ||
+			stripped.startsWith(base + '/scripts/edit')
 		)
 	}
 	afterNavigate((n) => {
@@ -315,7 +341,7 @@
 		}
 	}
 
-	let devOnly = $derived(page.url.pathname.startsWith(base + '/scripts/dev'))
+	let devOnly = $derived(stripWsPrefix(page.url.pathname).startsWith(base + '/scripts/dev'))
 
 	async function loadDefaultScripts(workspace: string, user: UserExt | undefined) {
 		if (!user?.operator) {
diff --git a/frontend/src/routes/(root)/(logged)/+page.svelte b/frontend/src/routes/(root)/(logged)/+page.svelte
index 9f7c9b493c6d9..e714ddc813dbc 100644
--- a/frontend/src/routes/(root)/(logged)/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/+page.svelte
@@ -23,7 +23,7 @@
 		LayoutDashboard
 	} from 'lucide-svelte'
 	import { hubBaseUrlStore } from '$lib/stores'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	import ItemsList from '$lib/components/home/ItemsList.svelte'
 	import CreateActionsApp from '$lib/components/flows/CreateActionsApp.svelte'
@@ -148,7 +148,7 @@
 				</div>
 			</Button>
 			<Button
-				href="{base}/scripts/add?hub={encodeURIComponent(codeViewerObj?.path ?? '')}"
+				href="{$wsBase}/scripts/add?hub={encodeURIComponent(codeViewerObj?.path ?? '')}"
 				startIcon={{ icon: GitFork }}
 				variant="accent"
 				size="xs"
@@ -185,7 +185,7 @@
 			</Button>
 
 			<Button
-				href="{base}/flows/add?hub={flowViewerFlow?.flow?.id}"
+				href="{$wsBase}/flows/add?hub={flowViewerFlow?.flow?.id}"
 				startIcon={{ icon: GitFork }}
 				variant="accent"
 				size="xs"
@@ -227,7 +227,7 @@
 			</Button>
 
 			<Button
-				href="{base}/apps/add?hub={appViewerApp?.app?.id}"
+				href="{$wsBase}/apps/add?hub={appViewerApp?.app?.id}"
 				startIcon={{ icon: GitFork }}
 				variant="accent"
 				disabled={appViewerApp == undefined}
diff --git a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
index bd900b38f0d13..de9165dbc8f8b 100644
--- a/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/get/[...path]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { goto } from '$app/navigation'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import AppPreview from '$lib/components/apps/editor/AppPreview.svelte'
 	import type { EditorBreakpoint } from '$lib/components/apps/types'
 
@@ -81,7 +81,7 @@
 						size="sm"
 						startIcon={{ icon: Pen }}
 						variant="subtle"
-						href="{base}/apps/edit/{app.path}?nodraft=true">Edit</Button
+						href="{$wsBase}/apps/edit/{app.path}?nodraft=true">Edit</Button
 					>
 				</div>
 			{/if}
diff --git a/frontend/src/routes/(root)/(logged)/apps_raw/add/+page.svelte b/frontend/src/routes/(root)/(logged)/apps_raw/add/+page.svelte
index f33fb36922442..04a4f31b7a46e 100644
--- a/frontend/src/routes/(root)/(logged)/apps_raw/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps_raw/add/+page.svelte
@@ -7,6 +7,7 @@
 	import { userStore, workspaceStore } from '$lib/stores'
 	import { afterNavigate, replaceState } from '$app/navigation'
 	import { goto } from '$lib/navigation'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { sendUserToast } from '$lib/toast'
 
 	import RawAppEditor from '$lib/components/raw_apps/RawAppEditor.svelte'
@@ -422,7 +423,7 @@
 						{#if $userStore?.is_admin}
 							Configure datatables in
 							<a
-								href="/workspace_settings?tab=windmill_data_tables"
+								href="{$wsBase}/workspace_settings?tab=windmill_data_tables"
 								target="_blank"
 								class="inline-flex items-center gap-1"
 								>workspace settings <ExternalLinkIcon size={16} />
@@ -547,7 +548,7 @@
 						{#if $userStore?.is_admin}
 							Configure AI in
 							<a
-								href="/workspace_settings?tab=ai"
+								href="{$wsBase}/workspace_settings?tab=ai"
 								target="_blank"
 								class="inline-flex items-center gap-1 font-semibold"
 								>workspace settings <ExternalLinkIcon size={16} />
diff --git a/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte
index eefa19fcd3d43..9d46b11a5b659 100644
--- a/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps_raw/get/[...path]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { base } from '$app/paths'
 	import { Button, Skeleton } from '$lib/components/common'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { AppService, type AppWithLastVersion } from '$lib/gen'
 	import { userStore, workspaceStore } from '$lib/stores'
 	import { canWrite } from '$lib/utils'
@@ -58,7 +58,7 @@
 				size="sm"
 				startIcon={{ icon: Pen }}
 				variant="subtle"
-				href="{base}/apps_raw/edit/{page.params.path}?nodraft=true">Edit</Button
+				href="{$wsBase}/apps_raw/edit/{page.params.path}?nodraft=true">Edit</Button
 			>
 		</div>
 	{/if}
diff --git a/frontend/src/routes/(root)/(logged)/concurrency_groups/+page.svelte b/frontend/src/routes/(root)/(logged)/concurrency_groups/+page.svelte
index 2272449e0f5f2..c8a8d75355465 100644
--- a/frontend/src/routes/(root)/(logged)/concurrency_groups/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/concurrency_groups/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { ConcurrencyGroup } from '$lib/gen'
 	import { ConcurrencyGroupsService } from '$lib/gen'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 
 	import CenteredPage from '$lib/components/CenteredPage.svelte'
 	import { Button } from '$lib/components/common'
@@ -91,7 +91,7 @@
 							<tr>
 								<td>
 									<a
-										href={`${base}/runs/?job_kinds=all&graph=ConcurrencyChart&concurrency_key=${concurrency_key}`}
+										href={`${$wsBase}/runs/?job_kinds=all&graph=ConcurrencyChart&concurrency_key=${concurrency_key}`}
 										>{concurrency_key}
 									</a>
 								</td>
diff --git a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
index 411576ef41d5c..40e7ec641872f 100644
--- a/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/add/+page.svelte
@@ -194,10 +194,10 @@
 		goto(`/flows/edit/${e.path}?selected=${e.id}`)
 	}}
 	onDeploy={(e) => {
-		goto(`/flows/get/${e.path}?workspace=${$workspaceStore}`)
+		goto(`/flows/get/${e.path}`)
 	}}
 	onDetails={(e) => {
-		goto(`/flows/get/${e.path}?workspace=${$workspaceStore}`)
+		goto(`/flows/get/${e.path}`)
 	}}
 	{initialPath}
 	{pathStoreInit}
diff --git a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
index 585830703768b..aba900a0e7b11 100644
--- a/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/edit/[...path]/+page.svelte
@@ -280,10 +280,10 @@
 {:else}
 	<FlowBuilder
 		onDeploy={(e) => {
-			goto(`/flows/get/${e.path}?workspace=${$workspaceStore}`)
+			goto(`/flows/get/${e.path}`)
 		}}
 		onDetails={(e) => {
-			goto(`/flows/get/${e.path}?workspace=${$workspaceStore}`)
+			goto(`/flows/get/${e.path}`)
 		}}
 		onSaveDraftOnlyAtNewPath={(e) => {
 			goto(`/flows/edit/${e.path}?selected=${e.selectedId}`)
diff --git a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
index 4eaec23449333..cb5580129d7c4 100644
--- a/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/flows/get/[...path]/+page.svelte
@@ -13,7 +13,7 @@
 
 	import DetailPageLayout from '$lib/components/details/DetailPageLayout.svelte'
 	import { goto } from '$lib/navigation'
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import { Badge as HeaderBadge, Alert } from '$lib/components/common'
 	import MoveDrawer from '$lib/components/MoveDrawer.svelte'
 	import RunForm from '$lib/components/RunForm.svelte'
@@ -197,7 +197,7 @@
 				tag: overrideTag,
 				skipPreprocessor: true
 			})
-			await goto('/run/' + run + '?workspace=' + $workspaceStore)
+			await goto('/run/' + run)
 		} catch (e) {
 			throw e
 		} finally {
@@ -247,7 +247,7 @@
 			buttons.push({
 				label: 'Fork',
 				buttonProps: {
-					href: `${base}/flows/add?template=${flow.path}`,
+					href: `${$wsBase}/flows/add?template=${flow.path}`,
 					variant: 'subtle',
 					unifiedSize: 'md',
 					disabled: !showEditButtons,
@@ -275,7 +275,7 @@
 		buttons.push({
 			label: `Runs`,
 			buttonProps: {
-				href: `${base}/runs/${flow.path}`,
+				href: `${$wsBase}/runs/${flow.path}`,
 				unifiedSize: 'md',
 				variant: 'subtle',
 				startIcon: Play
@@ -315,7 +315,7 @@
 			buttons.push({
 				label: 'Edit',
 				buttonProps: {
-					href: `${base}/flows/edit/${path}?nodraft=true`,
+					href: `${$wsBase}/flows/edit/${path}?nodraft=true`,
 					variant: 'accent',
 					unifiedSize: 'md',
 					disabled: !can_write || !showEditButtons,
@@ -474,7 +474,7 @@
 <MoveDrawer
 	bind:this={moveDrawer}
 	on:update={async (e) => {
-		await goto('/flows/get/' + e.detail + `?workspace=${$workspaceStore}`)
+		await goto('/flows/get/' + e.detail)
 		loadFlow()
 	}}
 />
@@ -515,7 +515,7 @@
 			onSaved={can_write
 				? async (newPath) => {
 						if (newPath !== flow?.path) {
-							await goto(`/flows/get/${newPath}?workspace=${$workspaceStore}`)
+							await goto(`/flows/get/${newPath}`)
 						} else {
 							loadFlow()
 						}
@@ -593,7 +593,7 @@
 									Deployment in progress
 									{#if deploymentJobId}
 										<a
-											href="/run/{deploymentJobId}?workspace={$workspaceStore}"
+											href="/run/{deploymentJobId}"
 											class="underline"
 											target="_blank">view job</a
 										>
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 5f7e426fe9970..f0f02572e35f5 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase, getWsBase } from '$lib/workspaceUrl'
 	import {
 		JobService,
 		type Job,
@@ -363,7 +363,7 @@
 					})
 				}
 
-				await goto('/run/' + id + '?workspace=' + $workspaceStore)
+				await goto('/run/' + id)
 			} else {
 				sendUserToast('Cannot run this job immediately', true)
 			}
@@ -456,7 +456,7 @@
 							variant="default"
 							unifiedSize="md"
 							on:click={() => {
-								goto(`/run/${page.params.run}?workspace=${workspace.id}`)
+								goto(`${getWsBase(workspace.id)}/run/${page.params.run}`)
 							}}
 						>
 							See in {workspace.name}
@@ -464,7 +464,7 @@
 					</div>
 				{/each}
 				<div>
-					<Button href="{base}/runs" unifiedSize="md" variant="accent">Go to runs page</Button>
+					<Button href="{$wsBase}/runs" unifiedSize="md" variant="accent">Go to runs page</Button>
 				</div>
 			</div>
 		</div>
@@ -624,7 +624,7 @@
 					{selectedJobStepType}
 					{restartBranchNames}
 					onRestartComplete={(newJobId) => {
-						goto('/run/' + newJobId + '?workspace=' + $workspaceStore)
+						goto('/run/' + newJobId)
 					}}
 					flowPath={job.script_path}
 					flowVersionId={job.script_hash ? parseInt(job.script_hash, 16) : undefined}
diff --git a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
index 04f494c629581..ccec6ea98a690 100644
--- a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte
@@ -6,7 +6,7 @@
 		WorkspaceService
 	} from '$lib/gen'
 	import { canWrite, displayDate, getLocalSetting, storeLocalSetting } from '$lib/utils'
-	import { base } from '$app/paths'
+	import { wsBase } from '$lib/workspaceUrl'
 	import CenteredPage from '$lib/components/CenteredPage.svelte'
 	import { Badge, Button, Skeleton } from '$lib/components/common'
 	import Dropdown from '$lib/components/DropdownV2.svelte'
@@ -362,7 +362,7 @@
 								/>
 								<div class="flex gap-2 items-center justify-end">
 									<Button
-										href={`${base}/runs/?schedule_path=${path}&show_schedules=true&show_future_jobs=true`}
+										href={`${$wsBase}/runs/?schedule_path=${path}&show_schedules=true&show_future_jobs=true`}
 										unifiedSize="md"
 										startIcon={{ icon: List }}
 										variant="subtle"
@@ -433,7 +433,7 @@
 												displayName: 'View runs',
 												icon: List,
 												href:
-													base +
+													$wsBase +
 													'/runs/?schedule_path=' +
 													path +
 													'&show_schedules=true&show_future_jobs=true'
@@ -441,7 +441,7 @@
 											{
 												displayName: 'Audit logs',
 												icon: Eye,
-												href: `${base}/audit_logs?resource=${path}`
+												href: `${$wsBase}/audit_logs?resource=${path}`
 											},
 											{
 												displayName: 'Run now',
@@ -476,7 +476,7 @@
 										{/if}
 										{#each jobs ?? [] as job}
 											{@const h = (avg_s ? job.duration_ms / avg_s : 1) * 7 + 3}
-											<a href="{base}/run/{job.id}?workspace={$workspaceStore}">
+											<a href="{$wsBase}/run/{job.id}">
 												<JobPreview id={job.id} class="p-4">
 													<div>
 														<div
diff --git a/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte
index 8f43dde796982..3466fe5e8b521 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/add/+page.svelte
@@ -161,7 +161,7 @@
 		lockedLanguage={templatePath != null || hubPath != null}
 		template={importedWacTemplate ?? (wacParam === 'python' ? 'wac_python' : wacParam === 'typescript' ? 'wac_typescript' : 'script')}
 		onDeploy={(e) => {
-			goto(`/scripts/get/${e.hash}?workspace=${$workspaceStore}`)
+			goto(`/scripts/get/${e.hash}`)
 		}}
 		onSaveInitial={(e) => {
 			goto(`/scripts/edit/${e.path}`)
diff --git a/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
index c7afd8f114838..1ea9c83aa6ebb 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/edit/[...path]/+page.svelte
@@ -214,13 +214,13 @@
 		{savedPrimarySchedule}
 		searchParams={page.url.searchParams}
 		onDeploy={(e) => {
-			goto(`/scripts/get/${e.hash}?workspace=${$workspaceStore}`)
+			goto(`/scripts/get/${e.hash}`)
 		}}
 		onSaveInitial={(e) => {
 			goto(`/scripts/edit/${e.path}`)
 		}}
 		onSeeDetails={(e) => {
-			goto(`/scripts/get/${e.path}?workspace=${$workspaceStore}`)
+			goto(`/scripts/get/${e.path}`)
 		}}
 		replaceStateFn={(path) => {
 			replaceState(path, page.state)
diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
index 4ba269b74a33a..6181bf9b7db84 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import {
 		JobService,
 		ScriptService,
@@ -309,7 +309,7 @@
 					skipPreprocessor: true
 				})
 			}
-			await goto('/run/' + run + '?workspace=' + $workspaceStore)
+			await goto('/run/' + run)
 		} catch (err) {
 			runLoading = false
 			sendUserToast(`Could not create job: ${err.body}`, true)
@@ -348,7 +348,7 @@
 			buttons.push({
 				label: 'Fork',
 				buttonProps: {
-					href: `${base}/scripts/add?template=${script.path}`,
+					href: `${$wsBase}/scripts/add?template=${script.path}`,
 					unifiedSize: 'md',
 					variant: 'subtle',
 					disabled: !showEditButtons,
@@ -381,7 +381,7 @@
 		buttons.push({
 			label: `Runs`,
 			buttonProps: {
-				href: `${base}/runs/${script.path}`,
+				href: `${$wsBase}/runs/${script.path}`,
 				unifiedSize: 'md',
 				variant: 'subtle',
 				startIcon: Play
@@ -441,7 +441,7 @@
 				buttons.push({
 					label: 'Edit',
 					buttonProps: {
-						href: `${base}/scripts/edit/${script.path}?${
+						href: `${$wsBase}/scripts/edit/${script.path}?${
 							topHash ? `&hash=${script.hash}&topHash=` + topHash : ''
 						}`,
 						unifiedSize: 'md',
@@ -613,7 +613,7 @@
 <MoveDrawer
 	bind:this={moveDrawer}
 	on:update={async (e) => {
-		await goto('/scripts/get/' + e.detail + `?workspace=${$workspaceStore}`)
+		await goto('/scripts/get/' + e.detail)
 		loadScript(page.params.hash ?? '')
 	}}
 />
@@ -632,7 +632,7 @@
 				openDetails
 				on:openDetails={(e) => {
 					if (script) {
-						goto(`/scripts/get/${e.detail.version}?workspace=${$workspaceStore}`)
+						goto(`/scripts/get/${e.detail.version}`)
 					}
 					versionsDrawerOpen = false
 				}}
@@ -663,7 +663,7 @@
 				onSaved={can_write
 					? async (newPath) => {
 							if (newPath !== script?.path) {
-								await goto(`/scripts/get/${newPath}?workspace=${$workspaceStore}`)
+								await goto(`/scripts/get/${newPath}`)
 							} else {
 								loadScript(page.params.hash ?? '')
 							}
@@ -750,7 +750,7 @@
 									<div class="mt-2"></div>
 									<Alert type="warning" title="Not HEAD">
 										This hash is not HEAD (latest non-archived version at this path) :
-										<a href="{base}/scripts/get/{topHash}?workspace={$workspaceStore}"
+										<a href="{$wsBase}/scripts/get/{topHash}"
 											>Go to the HEAD of this path</a
 										>
 									</Alert>
@@ -784,7 +784,7 @@
 								Deployment in progress
 								{#if deploymentJobId}
 									<a
-										href="/run/{deploymentJobId}?workspace={$workspaceStore}"
+										href="/run/{deploymentJobId}"
 										class="underline"
 										target="_blank">view job</a
 									>
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
index 3e7ef57bf6a06..4901dfb8b1c58 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/login/+page.svelte
@@ -11,6 +11,7 @@
 		whitelabelNameStore
 	} from '$lib/stores'
 	import { classNames, emptyString, parseQueryParams } from '$lib/utils'
+	import { extractWorkspaceFromPath } from '$lib/workspaceUrl'
 	import { getUserExt } from '$lib/user'
 	import { WindmillIcon } from '$lib/components/icons'
 	import LoginPageHeader from '$lib/components/LoginPageHeader.svelte'
@@ -69,7 +70,10 @@
 		if ($workspaceStore) {
 			goto(rd ?? '/')
 		} else {
-			let workspaceTarget = parseQueryParams(rd ?? undefined)['workspace']
+			// Extract workspace from rd path (/w/<ws>/...) or query param (?workspace=X)
+			let workspaceTarget =
+				extractWorkspaceFromPath(rd ?? '') ??
+				parseQueryParams(rd ?? undefined)['workspace']
 			if (rd && workspaceTarget) {
 				$workspaceStore = workspaceTarget
 				goto(rd)
diff --git a/frontend/src/routes/(root)/(logged)/workers/+page.svelte b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
index 9bc4d1d710f6d..dd08f7acc026f 100644
--- a/frontend/src/routes/(root)/(logged)/workers/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workers/+page.svelte
@@ -30,6 +30,7 @@
 		workspaceStore,
 		userWorkspaces
 	} from '$lib/stores'
+	import { getWsBase } from '$lib/workspaceUrl'
 	import { sendUserToast } from '$lib/toast'
 	import { displayDate, groupBy, pluralize, retrieveCommonWorkerPrefix, truncate } from '$lib/utils'
 	import {
@@ -1100,7 +1101,7 @@
 													{#if (!config || config?.dedicated_worker == undefined) && ($superadmin || $devopsRole)}
 														<Cell class="text-secondary">
 															{#if last_job_id}
-																<a href={`/run/${last_job_id}?workspace=${last_job_workspace_id}`}>
+																<a href={`${getWsBase(last_job_workspace_id)}/run/${last_job_id}`}>
 																	View last job
 																	<ExternalLink size={12} class="inline-block" />
 																</a>
diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
index 24900d907629d..2af8fddb79920 100644
--- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
@@ -51,6 +51,7 @@
 		type S3ResourceSettings
 	} from '$lib/workspace_settings'
 	import { base } from '$lib/base'
+	import { wsBase } from '$lib/workspaceUrl'
 	import ConnectionSection from '$lib/components/ConnectionSection.svelte'
 	import AISettings from '$lib/components/workspaceSettings/AISettings.svelte'
 	import StorageSettings from '$lib/components/workspaceSettings/StorageSettings.svelte'
@@ -1315,8 +1316,8 @@
 										}}
 										onSelect={editSlackCommand}
 										connectHref="{base}/api/oauth/connect_slack"
-										createScriptHref="{base}/scripts/add?hub=hub%2F28071%2Fslack%2Fexample_of_responding_to_a_slack_command_slack"
-										createFlowHref="{base}/flows/add?hub=28"
+										createScriptHref="{$wsBase}/scripts/add?hub=hub%2F28071%2Fslack%2Fexample_of_responding_to_a_slack_command_slack"
+										createFlowHref="{$wsBase}/flows/add?hub=28"
 										documentationLink="https://www.windmill.dev/docs/integrations/slack"
 										onLoadSettings={loadSettings}
 										display_name={slack_team_name}
@@ -1451,8 +1452,8 @@
 											}}
 											onSelect={editTeamsCommand}
 											connectHref={undefined}
-											createScriptHref="{base}/scripts/add?hub=hub%2F11591%2Fteams%2FExample%20of%20responding%20to%20a%20Microsoft%20Teams%20command"
-											createFlowHref="{base}/flows/add?hub=58"
+											createScriptHref="{$wsBase}/scripts/add?hub=hub%2F11591%2Fteams%2FExample%20of%20responding%20to%20a%20Microsoft%20Teams%20command"
+											createFlowHref="{$wsBase}/flows/add?hub=58"
 											documentationLink="https://www.windmill.dev/docs/integrations/teams"
 											onLoadSettings={loadSettings}
 											display_name={teams_team_name}
@@ -1684,7 +1685,7 @@
 											/>
 											<Button
 												variant="default"
-												href={`${base}/scripts/add?lang=bun#` +
+												href={`${$wsBase}/scripts/add?lang=bun#` +
 													encodeState({
 														path: 'f/success_handler',
 														summary: 'Workspace Success Handler',
diff --git a/frontend/src/routes/(root)/+layout.svelte b/frontend/src/routes/(root)/+layout.svelte
index 0ad18653423b6..b0ec51178efc7 100644
--- a/frontend/src/routes/(root)/+layout.svelte
+++ b/frontend/src/routes/(root)/+layout.svelte
@@ -9,6 +9,7 @@
 	import { onDestroy, onMount } from 'svelte'
 
 	import { refreshSuperadmin } from '$lib/refreshUser'
+	import { extractWorkspaceFromPath, stripWsPrefix } from '$lib/workspaceUrl'
 	// import EditorTheme from '$lib/components/EditorTheme.svelte'
 	import { computeDrift } from '$lib/forLater'
 	import { setLicense } from '$lib/enterpriseUtils'
@@ -40,6 +41,14 @@
 		try {
 			await refreshSuperadmin()
 
+			// Extract workspace from URL path if present
+			if (!$workspaceStore) {
+				const wsFromUrl = extractWorkspaceFromPath(page.url.pathname)
+				if (wsFromUrl) {
+					$workspaceStore = wsFromUrl
+				}
+			}
+
 			if ($workspaceStore) {
 				if ($userStore) {
 					console.log(`Welcome back ${$userStore.username} to ${$workspaceStore}`)
@@ -50,9 +59,10 @@
 					}
 				}
 			} else {
+				const strippedPath = stripWsPrefix(page.url.pathname)
 				if (
-					(!page.url.pathname.startsWith('/user/') || page.url.pathname.startsWith('/user/cli')) &&
-					!page.url.pathname.startsWith('/oauth/mcp_authorize')
+					(!strippedPath.startsWith('/user/') || strippedPath.startsWith('/user/cli')) &&
+					!strippedPath.startsWith('/oauth/mcp_authorize')
 				) {
 					goto(
 						`/user/workspaces?rd=${encodeURIComponent(page.url.href.replace(page.url.origin, ''))}`
@@ -63,7 +73,8 @@
 			}
 		} catch (e) {
 			console.error(e)
-			if (page.url.pathname != '/user/login' && page.url.pathname != '/user/logout') {
+			const strippedPath = stripWsPrefix(page.url.pathname)
+			if (strippedPath != '/user/login' && strippedPath != '/user/logout') {
 				const url = page.url
 				console.log('logout 5', url.href.replace(url.origin, ''))
 				await logoutWithRedirect(url.href.replace(url.origin, ''))