diff --git a/web-admin/src/features/alerts/selectors.ts b/web-admin/src/features/alerts/selectors.ts
index 7115eec5a30..cbaccf21543 100644
--- a/web-admin/src/features/alerts/selectors.ts
+++ b/web-admin/src/features/alerts/selectors.ts
@@ -9,7 +9,7 @@ import {
   createRuntimeServiceListResources,
   type V1AlertSpec,
 } from "@rilldata/web-common/runtime-client";
-import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 import { derived, type Readable, readable } from "svelte/store";
 
 export function useAlerts(instanceId: string, enabled = true) {
@@ -22,7 +22,7 @@ export function useAlerts(instanceId: string, enabled = true) {
       query: {
         enabled: enabled && !!instanceId,
         refetchOnMount: true,
-        refetchInterval: createSmartRefetchInterval,
+        refetchInterval: smartRefetchIntervalFunc,
       },
     },
   );
diff --git a/web-admin/src/features/dashboards/listing/deploying-dashboards.ts b/web-admin/src/features/dashboards/listing/deploying-dashboards.ts
index 928609a0a0c..0d329f5dfc2 100644
--- a/web-admin/src/features/dashboards/listing/deploying-dashboards.ts
+++ b/web-admin/src/features/dashboards/listing/deploying-dashboards.ts
@@ -1,4 +1,3 @@
-import { isResourceReconciling } from "@rilldata/web-admin/lib/refetch-interval-store.ts";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors.ts";
 import {
   createRuntimeServiceListResources,
@@ -6,84 +5,82 @@ import {
   type V1Resource,
 } from "@rilldata/web-common/runtime-client";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
+import {
+  isResourceReconciling,
+  smartRefetchIntervalFunc,
+} from "@rilldata/web-admin/lib/refetch-interval-store.ts";
 
 export function useDeployingDashboards(
   instanceId: string,
   orgName: string,
   projName: string,
-  deploying: boolean,
   deployingDashboard: string | null,
 ): CreateQueryResult<{
-  redirectToDashboardPath: string | null;
-  dashboardsReconciling: boolean;
+  redirectPath: string | null;
   dashboardsErrored: boolean;
 }> {
   return createRuntimeServiceListResources(instanceId, undefined, {
     query: {
       select: (data) => {
-        if (!deploying) {
+        const resources = data.resources ?? [];
+        const dashboards = resources.filter(isDashboard);
+
+        const reconciling = getDashboardsReconciling(
+          dashboards,
+          deployingDashboard,
+        );
+        if (reconciling) {
           return {
-            redirectToDashboardPath: null,
-            dashboardsReconciling: false,
+            redirectPath: null,
             dashboardsErrored: false,
           };
         }
 
-        const resources = data.resources ?? [];
-        const dashboards = resources.filter(isDashboard);
-        const dashboard = getDashboard(dashboards, deployingDashboard) ?? null;
-        const hasValidDashboard = dashboard
-          ? isValidDashboard(dashboard)
-          : false;
+        const dashboardsErrored = getDashboardsErrored(
+          dashboards,
+          deployingDashboard,
+        );
+        if (dashboardsErrored) {
+          const dashboardsErrored = getDashboardsErrored(
+            dashboards,
+            deployingDashboard,
+          );
+          return {
+            // Redirect to status page is dashboards errored
+            redirectPath: dashboardsErrored
+              ? `/${orgName}/${projName}/-/status`
+              : null,
+            dashboardsErrored,
+          };
+        }
 
-        if (!hasValidDashboard || !dashboard?.meta?.name?.name) {
+        const dashboard = dashboards.find(
+          (res) => res.meta?.name?.name === deployingDashboard,
+        );
+
+        // Redirect to home page if no specific dashboard was deployed
+        if (!deployingDashboard || !dashboard?.meta?.name) {
           return {
-            redirectToDashboardPath: null,
-            dashboardsReconciling: getDashboardsReconciling(
-              dashboards,
-              deployingDashboard,
-            ),
-            dashboardsErrored: getDashboardsErrored(
-              dashboards,
-              deployingDashboard,
-            ),
+            redirectPath: `/${orgName}/${projName}`,
+            dashboardsErrored: false,
           };
         }
 
         const resourceRoute =
-          dashboard.meta?.name?.kind === ResourceKind.Explore
+          dashboard.meta.name.kind === ResourceKind.Explore
             ? "explore"
             : "canvas";
-        const redirectToDashboardPath = `/${orgName}/${projName}/${resourceRoute}/${dashboard.meta.name.name}`;
-
+        const redirectPath = `/${orgName}/${projName}/${resourceRoute}/${dashboard.meta.name.name}`;
         return {
-          redirectToDashboardPath,
-          dashboardsReconciling: false,
+          redirectPath,
           dashboardsErrored: false,
         };
       },
+      refetchInterval: smartRefetchIntervalFunc,
     },
   });
 }
 
-function getDashboard(
-  dashboards: V1Resource[],
-  dashboardName: string | null,
-): V1Resource | undefined {
-  let dashboard: V1Resource | undefined;
-  if (dashboardName) {
-    dashboard = dashboards.find(
-      (res) => res.meta?.name?.name === dashboardName,
-    );
-  } else {
-    dashboard =
-      dashboards.find((res) => res.canvas?.state?.validSpec) ??
-      dashboards.find((res) => res.explore?.state?.validSpec);
-  }
-
-  return dashboard;
-}
-
 function getDashboardsReconciling(
   dashboards: V1Resource[],
   dashboardName: string | null,
@@ -116,10 +113,6 @@ function isDashboard(res: V1Resource) {
   return res.canvas || res.explore;
 }
 
-function isValidDashboard(res: V1Resource) {
-  return Boolean(res.canvas?.state?.validSpec || res.explore?.state?.validSpec);
-}
-
 function hasErrored(res: V1Resource) {
   return (
     res.meta?.reconcileStatus === V1ReconcileStatus.RECONCILE_STATUS_IDLE &&
diff --git a/web-admin/src/features/dashboards/listing/selectors.ts b/web-admin/src/features/dashboards/listing/selectors.ts
index 7f28a786b57..fa3d3e9803f 100644
--- a/web-admin/src/features/dashboards/listing/selectors.ts
+++ b/web-admin/src/features/dashboards/listing/selectors.ts
@@ -4,7 +4,7 @@ import type { V1Resource } from "@rilldata/web-common/runtime-client";
 import { createRuntimeServiceListResources } from "@rilldata/web-common/runtime-client";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
 import { derived } from "svelte/store";
-import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 
 export function useDashboardsLastUpdated(
   instanceId: string,
@@ -42,7 +42,7 @@ export function useDashboards(
       select: (data) => {
         return data.resources.filter((res) => res.canvas || res.explore);
       },
-      refetchInterval: createSmartRefetchInterval,
+      refetchInterval: smartRefetchIntervalFunc,
     },
   });
 }
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
index d226fb687fd..9724d55bf55 100644
--- a/web-admin/src/features/projects/status/selectors.ts
+++ b/web-admin/src/features/projects/status/selectors.ts
@@ -7,7 +7,7 @@ import {
   type V1ListResourcesResponse,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
-import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -42,7 +42,7 @@ export function useResources(instanceId: string) {
             resources: filtered,
           };
         },
-        refetchInterval: createSmartRefetchInterval,
+        refetchInterval: smartRefetchIntervalFunc,
       },
     },
   );
diff --git a/web-admin/src/features/scheduled-reports/selectors.ts b/web-admin/src/features/scheduled-reports/selectors.ts
index 2fd13655fdb..eccb3973b4a 100644
--- a/web-admin/src/features/scheduled-reports/selectors.ts
+++ b/web-admin/src/features/scheduled-reports/selectors.ts
@@ -5,7 +5,7 @@ import {
   createRuntimeServiceGetResource,
   createRuntimeServiceListResources,
 } from "@rilldata/web-common/runtime-client";
-import { createSmartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 
 export function useReports(instanceId: string, enabled = true) {
   return createRuntimeServiceListResources(
@@ -17,7 +17,7 @@ export function useReports(instanceId: string, enabled = true) {
       query: {
         enabled: enabled && !!instanceId,
         refetchOnMount: true,
-        refetchInterval: createSmartRefetchInterval,
+        refetchInterval: smartRefetchIntervalFunc,
       },
     },
   );
diff --git a/web-admin/src/lib/refetch-interval-store.ts b/web-admin/src/lib/refetch-interval-store.ts
index 701e889b6ee..3fd716506f1 100644
--- a/web-admin/src/lib/refetch-interval-store.ts
+++ b/web-admin/src/lib/refetch-interval-store.ts
@@ -64,13 +64,13 @@ const queryRefetchStateMap = new WeakMap<
 >();
 
 /**
- * Creates a smart refetch interval function that uses a WeakMap to store state.
+ * A smart refetch interval function that uses a WeakMap to store state.
  * This approach keeps refetch state per query without mutating the query object.
  *
  * @param query The TanStack query object
  * @returns The refetch interval (number in ms or false to disable)
  */
-export function createSmartRefetchInterval(
+export function smartRefetchIntervalFunc(
   query: Query<
     V1ListResourcesResponse,
     HTTPError,
diff --git a/web-admin/src/routes/[organization]/[project]/-/dashboards/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/dashboards/+page.svelte
index 5b1ecb27568..93c430bbe3e 100644
--- a/web-admin/src/routes/[organization]/[project]/-/dashboards/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/dashboards/+page.svelte
@@ -1,61 +1,19 @@
 <script lang="ts">
-  import { goto } from "$app/navigation";
-  import { navigating, page } from "$app/stores";
+  import { page } from "$app/stores";
   import ContentContainer from "@rilldata/web-admin/components/layout/ContentContainer.svelte";
-  import DashboardBuilding from "@rilldata/web-common/features/dashboards/DashboardBuilding.svelte";
-  import DashboardErrored from "@rilldata/web-admin/features/dashboards/DashboardErrored.svelte";
   import DashboardsTable from "@rilldata/web-admin/features/dashboards/listing/DashboardsTable.svelte";
-  import { useDeployingDashboards } from "@rilldata/web-admin/features/dashboards/listing/deploying-dashboards.ts";
-  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
-  import type { PageData } from "./$types";
-
-  export let data: PageData;
-  const { deploying, deployingDashboard } = data;
 
   $: ({
-    params: { organization, project },
+    params: { project },
   } = $page);
-  $: ({ instanceId } = $runtime);
-
-  $: deployingDashboards = useDeployingDashboards(
-    instanceId,
-    organization,
-    project,
-    deploying,
-    deployingDashboard,
-  );
-  $: ({ isPending, data: deployingDashboardsData } = $deployingDashboards);
-  $: ({ redirectToDashboardPath, dashboardsReconciling, dashboardsErrored } =
-    deployingDashboardsData ?? {
-      redirectToDashboardPath: null,
-      dashboardsReconciling: false,
-      dashboardsErrored: false,
-    });
-
-  $: if (redirectToDashboardPath) {
-    void goto(redirectToDashboardPath);
-  }
-  // Continue showing a spinner when redirecting to target dashboard after deploy.
-  // This prevents a flash just after dashboard has loaded and before the dashboard components get mounted.
-  $: redirecting = $navigating?.to?.url.pathname === redirectToDashboardPath;
-
-  $: showSpinner =
-    dashboardsReconciling || (deploying && isPending) || redirecting;
-  $: showError = dashboardsErrored && !redirecting;
 </script>
 
 <svelte:head>
   <title>{project} overview - Rill</title>
 </svelte:head>
 
-{#if showError}
-  <DashboardErrored {organization} {project} />
-{:else if showSpinner}
-  <DashboardBuilding multipleDashboards />
-{:else}
-  <ContentContainer maxWidth={800} title="Project dashboards">
-    <div class="flex flex-col items-center gap-y-4">
-      <DashboardsTable />
-    </div>
-  </ContentContainer>
-{/if}
+<ContentContainer maxWidth={800} title="Project dashboards">
+  <div class="flex flex-col items-center gap-y-4">
+    <DashboardsTable />
+  </div>
+</ContentContainer>
diff --git a/web-admin/src/routes/[organization]/[project]/-/deploy-landing-page/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/deploy-landing-page/+page.svelte
new file mode 100644
index 00000000000..cbc16df27b1
--- /dev/null
+++ b/web-admin/src/routes/[organization]/[project]/-/deploy-landing-page/+page.svelte
@@ -0,0 +1,35 @@
+<script lang="ts">
+  import { goto } from "$app/navigation";
+  import DashboardBuilding from "@rilldata/web-common/features/dashboards/DashboardBuilding.svelte";
+  import { useDeployingDashboards } from "@rilldata/web-admin/features/dashboards/listing/deploying-dashboards.ts";
+  import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus.ts";
+  import type { PageData } from "./$types";
+
+  export let data: PageData;
+  const { organization, project, runtime, deployingDashboard } = data;
+
+  const deployingDashboardResp = useDeployingDashboards(
+    runtime.instanceId,
+    organization,
+    project.name,
+    deployingDashboard,
+  );
+
+  $: ({ data: deployingDashboardsData } = $deployingDashboardResp);
+  $: ({ redirectPath, dashboardsErrored } = deployingDashboardsData ?? {
+    redirectPath: null,
+    dashboardsErrored: false,
+  });
+
+  $: if (redirectPath) {
+    if (dashboardsErrored) {
+      eventBus.emit("notification", {
+        type: "error",
+        message: "Failed to deploy dashboards",
+      });
+    }
+    void goto(redirectPath);
+  }
+</script>
+
+<DashboardBuilding multipleDashboards />
diff --git a/web-admin/src/routes/[organization]/[project]/-/dashboards/+page.ts b/web-admin/src/routes/[organization]/[project]/-/deploy-landing-page/+page.ts
similarity index 80%
rename from web-admin/src/routes/[organization]/[project]/-/dashboards/+page.ts
rename to web-admin/src/routes/[organization]/[project]/-/deploy-landing-page/+page.ts
index 2075a09ff34..2a2be6254f0 100644
--- a/web-admin/src/routes/[organization]/[project]/-/dashboards/+page.ts
+++ b/web-admin/src/routes/[organization]/[project]/-/deploy-landing-page/+page.ts
@@ -1,11 +1,9 @@
 import { DeployingDashboardUrlParam } from "@rilldata/web-common/features/project/deploy/utils.ts";
 
 export const load = ({ url: { searchParams } }) => {
-  const deploying = searchParams.has("deploying");
   const deployingDashboard = searchParams.get(DeployingDashboardUrlParam);
 
   return {
-    deploying,
     deployingDashboard,
   };
 };
diff --git a/web-admin/src/routes/[organization]/[project]/-/invite/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/invite/+page.svelte
index 3924ff89bfc..6f5f5f54241 100644
--- a/web-admin/src/routes/[organization]/[project]/-/invite/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/invite/+page.svelte
@@ -68,8 +68,8 @@
 
   function getDeployLandingPage() {
     const u = new URL($page.url);
-    u.pathname = `/${organization}/${project}/-/dashboards`;
-    u.searchParams.set("deploying", "true");
+    u.pathname = `/${organization}/${project}/-/deploy-landing-page`;
+    console.log("Redirecting to deploy landing page: ", u.toString());
     return u.toString();
   }
 </script>
diff --git a/web-common/src/features/dashboards/workspace/DeployProjectCTA.svelte b/web-common/src/features/dashboards/workspace/DeployProjectCTA.svelte
index 9193e40392d..4d86f6cfa2e 100644
--- a/web-common/src/features/dashboards/workspace/DeployProjectCTA.svelte
+++ b/web-common/src/features/dashboards/workspace/DeployProjectCTA.svelte
@@ -66,6 +66,7 @@
   $: redirectPageUrl = copyWithAdditionalArguments($page.url, {
     deploy: "true",
   });
+  $: console.log("Deploy route:", $deployPageUrl);
 
   async function onDeploy(resumingDeploy = false) {
     await waitUntil(() => !get(deploymentState).loading);
diff --git a/web-common/src/features/entity-management/file-artifacts.ts b/web-common/src/features/entity-management/file-artifacts.ts
index 0be89adcdc1..df6b8e2f314 100644
--- a/web-common/src/features/entity-management/file-artifacts.ts
+++ b/web-common/src/features/entity-management/file-artifacts.ts
@@ -8,8 +8,9 @@ import {
   type V1ResourceName,
 } from "@rilldata/web-common/runtime-client";
 import type { QueryClient } from "@tanstack/svelte-query";
-import { derived, get, writable } from "svelte/store";
+import { derived, get, writable, type Readable } from "svelte/store";
 import { FileArtifact } from "./file-artifact";
+import { page } from "$app/stores";
 
 class UnsavedFilesStore {
   private unsavedFiles = writable(new Set<string>());
@@ -171,6 +172,14 @@ export class FileArtifacts {
     }
     return null;
   }
+
+  public createCurrentResourceStore(): Readable<V1ResourceName | undefined> {
+    return derived(page, (pageState, set) => {
+      const filePath = pageState.url.pathname.replace("/files", "");
+      const fileArtifact = this.getFileArtifact(filePath);
+      return fileArtifact.resourceName.subscribe(set);
+    });
+  }
 }
 
 export const fileArtifacts = new FileArtifacts();
diff --git a/web-common/src/features/project/deploy/UpdateProjectPopup.svelte b/web-common/src/features/project/deploy/UpdateProjectPopup.svelte
index 5a2a977c7fd..3974628cc78 100644
--- a/web-common/src/features/project/deploy/UpdateProjectPopup.svelte
+++ b/web-common/src/features/project/deploy/UpdateProjectPopup.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { page } from "$app/stores";
   import { Button } from "@rilldata/web-common/components/button";
   import * as Popover from "@rilldata/web-common/components/popover";
   import ProjectSelector from "@rilldata/web-common/features/project/deploy/ProjectSelector.svelte";
@@ -8,6 +9,7 @@
   import { getManageProjectAccess } from "@rilldata/web-common/features/project/selectors.ts";
   import type { Project } from "@rilldata/web-common/proto/gen/rill/admin/v1/api_pb";
   import Rocket from "svelte-radix/Rocket.svelte";
+  import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts.ts";
 
   export let open = false;
   export let matchingProjects: Project[];
@@ -21,8 +23,14 @@
 
   $: enableUpdate = !!selectedProject;
 
+  const currentResource = fileArtifacts.createCurrentResourceStore();
   $: deployUrl = selectedProject
-    ? getUpdateProjectRoute(selectedProject.orgName, selectedProject.name)
+    ? getUpdateProjectRoute(
+        $page,
+        $currentResource,
+        selectedProject.orgName,
+        selectedProject.name,
+      )
     : "";
 
   let showRequestProjectAccess = false;
diff --git a/web-common/src/features/project/deploy/route-utils.ts b/web-common/src/features/project/deploy/route-utils.ts
index f2a4ecb37af..da932117bfc 100644
--- a/web-common/src/features/project/deploy/route-utils.ts
+++ b/web-common/src/features/project/deploy/route-utils.ts
@@ -11,6 +11,7 @@ import { derived, readable } from "svelte/store";
 import { getLocalGitRepoStatus } from "../selectors";
 import { page } from "$app/stores";
 import { featureFlags } from "../../feature-flags";
+import type { V1ResourceName } from "@rilldata/web-common/runtime-client";
 
 /**
  * Returns a {@link Readable} with a route to deploy.
@@ -41,14 +42,35 @@ export function getCreateProjectRoute(orgName: string, useGit = false) {
 }
 
 export function getUpdateProjectRoute(
+  page: Page,
+  currentResource: V1ResourceName | undefined,
   orgName: string,
   projectName: string,
   createManagedRepo = false,
 ) {
-  const createManagedRepoParam = createManagedRepo
-    ? "&create_managed_repo=true"
-    : "";
-  return `/deploy/project/update?org=${orgName}&project=${projectName}${createManagedRepoParam}`;
+  const deployUrl = new URL(page.url);
+  deployUrl.pathname = "/deploy/project/update";
+  deployUrl.search = "";
+
+  deployUrl.searchParams.set("org", orgName);
+  deployUrl.searchParams.set("project", projectName);
+  if (createManagedRepo) {
+    deployUrl.searchParams.set("create_managed_repo", "true");
+  }
+
+  if (
+    currentResource?.kind === ResourceKind.Explore ||
+    currentResource?.kind === ResourceKind.Canvas
+  ) {
+    deployUrl.searchParams.set(
+      DeployingDashboardUrlParam,
+      currentResource.name!,
+    );
+  } else if (isDashboardVizRoute(page)) {
+    deployUrl.searchParams.set(DeployingDashboardUrlParam, page.params.name);
+  }
+
+  return deployUrl.toString();
 }
 
 export function getSelectProjectRoute() {
@@ -67,14 +89,17 @@ export function getSelectOrganizationRoute() {
   return `/deploy/organization/select`;
 }
 
-export function getDeployLandingPage(frontendUrl: string) {
+export function getDeployLandingPage(frontendUrl: string, isInvite: boolean) {
   const url = new URL(frontendUrl);
-  url.searchParams.set("deploying", "true");
   const deployingDashboard = getDeployingDashboard();
   if (deployingDashboard) {
-    url.searchParams.set("deploying_dashboard", deployingDashboard);
+    url.searchParams.set(DeployingDashboardUrlParam, deployingDashboard);
+  }
+  if (isInvite) {
+    url.pathname += "/-/invite";
+  } else {
+    url.pathname += "/-/deploy-landing-page";
   }
-  url.pathname += "/-/invite";
   const projectInviteUrlWithSessionId = addPosthogSessionIdToUrl(
     url.toString(),
   );
diff --git a/web-common/src/features/project/deploy/utils.ts b/web-common/src/features/project/deploy/utils.ts
index 627728d8c81..f3263c123fe 100644
--- a/web-common/src/features/project/deploy/utils.ts
+++ b/web-common/src/features/project/deploy/utils.ts
@@ -16,5 +16,9 @@ export function maybeSetDeployingDashboard(url: URL) {
 }
 
 export function getDeployingDashboard() {
-  return sessionStorage.getItem(deployingDashboardKey);
+  const url = new URL(window.location.href);
+  return (
+    sessionStorage.getItem(deployingDashboardKey) ||
+    url.searchParams.get(DeployingDashboardUrlParam)
+  );
 }
diff --git a/web-integration/tests/deploy.spec.ts b/web-integration/tests/deploy.spec.ts
index 39a28e4077b..02248dcf1ff 100644
--- a/web-integration/tests/deploy.spec.ts
+++ b/web-integration/tests/deploy.spec.ts
@@ -77,6 +77,15 @@ test.describe("Deploy journey", () => {
         rillDevPage.getByText("Deploy this project for free"),
       ).toBeVisible();
       // Hit continue to start deployment
+      await expect
+        .poll(
+          () =>
+            rillDevPage
+              .getByRole("button", { name: "Continue" })
+              .getAttribute("href"),
+          { intervals: Array(15).fill(1_000), timeout: 15_000 },
+        )
+        .toMatch(/deploying_dashboard/);
       await rillDevPage.getByRole("button", { name: "Continue" }).click();
 
       // Await for the popped up deploy page after hitting deploy
@@ -131,6 +140,10 @@ test.describe("Deploy journey", () => {
       await rillDevPage
         .getByTitle("Display name")
         .fill("Adbids dashboard edited first org");
+      // Wait for reconcile to complete and dashboard is ready
+      await expect(rillDevPage.getByText("Total records 100k")).toBeVisible({
+        timeout: 30_000,
+      });
 
       // Start waiting for popup before clicking Deploy.
       const popupPromise = rillDevPage.waitForEvent("popup");
@@ -152,12 +165,10 @@ test.describe("Deploy journey", () => {
       // Await for the popped up deploy page after hitting deploy
       const deployPage = await popupPromise;
 
-      await ensureProjectRedeployed(deployPage);
-
-      await ensureDashboardTitle(
-        deployPage,
-        "Adbids dashboard edited first org",
-      );
+      // Explore is opened with updated title after a re-deploying.
+      await expect(
+        deployPage.getByLabel("Breadcrumb navigation, level 2"),
+      ).toHaveText("Adbids dashboard edited first org", { timeout: 120_000 });
     });
   });
 
@@ -197,10 +208,10 @@ test.describe("Deploy journey", () => {
 
     await assertAndSkipInvite(deployPage);
 
-    // Canvas is opened.
-    await expect(
-      deployPage.getByLabel("Breadcrumb navigation, level 2"),
-    ).toHaveText("Adbids Canvas Dashboard");
+    // Project homepage is opened on since we are not deploying from any dashboard.
+    await expect(deployPage.getByText("Welcome to")).toBeVisible({
+      timeout: 120_000,
+    });
 
     // Org title is correct
     await expect(
@@ -225,18 +236,3 @@ async function assertAndSkipInvite(page: Page) {
   // Skip invite and continue to status page.
   await page.getByRole("button", { name: "Skip for now" }).click();
 }
-
-async function ensureProjectRedeployed(page: Page) {
-  // Project homepage is opened on a re-deploy. This can take a while, so it has increased timeout.
-  await expect(page.getByText("Welcome to")).toBeVisible({
-    timeout: 120_000,
-  });
-}
-
-async function ensureDashboardTitle(page: Page, title: string) {
-  await expect(
-    page.getByRole("link", {
-      name: title,
-    }),
-  ).toBeVisible({ timeout: 60_000 });
-}
diff --git a/web-local/src/routes/(misc)/deploy/+page.svelte b/web-local/src/routes/(misc)/deploy/+page.svelte
index 5567ca892aa..eaec1ed5e0e 100644
--- a/web-local/src/routes/(misc)/deploy/+page.svelte
+++ b/web-local/src/routes/(misc)/deploy/+page.svelte
@@ -78,7 +78,12 @@
       const singleProject = $matchingProjects.data!.projects[0];
       // Project already exists. Run a redeploy
       return goto(
-        getUpdateProjectRoute(singleProject.orgName, singleProject.name),
+        getUpdateProjectRoute(
+          $page,
+          undefined,
+          singleProject.orgName,
+          singleProject.name,
+        ),
       );
     } else {
       return goto(getSelectProjectRoute());
diff --git a/web-local/src/routes/(misc)/deploy/project/create/+page.svelte b/web-local/src/routes/(misc)/deploy/project/create/+page.svelte
index b65beec6688..d17811e09a0 100644
--- a/web-local/src/routes/(misc)/deploy/project/create/+page.svelte
+++ b/web-local/src/routes/(misc)/deploy/project/create/+page.svelte
@@ -90,7 +90,7 @@
     if (!resp.frontendUrl) return;
 
     // projectUrl: https://ui.rilldata.com/<org>/<project>
-    const projectInviteUrl = getDeployLandingPage(resp.frontendUrl);
+    const projectInviteUrl = getDeployLandingPage(resp.frontendUrl, true);
     window.open(projectInviteUrl, "_self");
   }
 
diff --git a/web-local/src/routes/(misc)/deploy/project/select/+page.svelte b/web-local/src/routes/(misc)/deploy/project/select/+page.svelte
index 0d553cf7a06..82742003090 100644
--- a/web-local/src/routes/(misc)/deploy/project/select/+page.svelte
+++ b/web-local/src/routes/(misc)/deploy/project/select/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { page } from "$app/stores";
   import { Button } from "@rilldata/web-common/components/button";
   import {
     getSelectOrganizationRoute,
@@ -13,6 +14,8 @@
   let selectedProject: Project | undefined = undefined;
 
   $: deployUrl = getUpdateProjectRoute(
+    $page,
+    undefined,
     selectedProject?.orgName ?? "",
     selectedProject?.name ?? "",
   );
diff --git a/web-local/src/routes/(misc)/deploy/project/update/+page.svelte b/web-local/src/routes/(misc)/deploy/project/update/+page.svelte
index cc75cbfa6fd..d33b6661279 100644
--- a/web-local/src/routes/(misc)/deploy/project/update/+page.svelte
+++ b/web-local/src/routes/(misc)/deploy/project/update/+page.svelte
@@ -5,7 +5,6 @@
     getIsOrgOnTrial,
     getPlanUpgradeUrl,
   } from "@rilldata/web-common/features/organization/utils.ts";
-  import { addPosthogSessionIdToUrl } from "@rilldata/web-common/lib/analytics/posthog.ts";
   import { waitUntil } from "@rilldata/web-common/lib/waitUtils.ts";
   import {
     createLocalServiceGetProjectRequest,
@@ -18,6 +17,7 @@
   import { onMount } from "svelte";
   import { get } from "svelte/store";
   import type { PageData } from "./$types";
+  import { getDeployLandingPage } from "@rilldata/web-common/features/project/deploy/route-utils.ts";
 
   export let data: PageData;
 
@@ -52,8 +52,8 @@
       createManagedRepo,
     });
     const projectUrl = resp.frontendUrl; // https://ui.rilldata.com/<org>/<project>
-    const projectUrlWithSessionId = addPosthogSessionIdToUrl(projectUrl);
-    window.open(projectUrlWithSessionId, "_self");
+    const projectDeployLandingPage = getDeployLandingPage(projectUrl, false);
+    window.open(projectDeployLandingPage, "_self");
   }
 
   function onRetry() {