diff --git a/package-lock.json b/package-lock.json
index 4e2b8815..96440e9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,7 +42,7 @@
         "@vitejs/plugin-react": "^4.3.1",
         "classnames": "^2.5.1",
         "cross-env": "7.0.3",
-        "decentraland-ui2": "^0.6.0",
+        "decentraland-ui2": "^0.6.1",
         "electron": "31.1.0",
         "electron-builder": "24.13.3",
         "eslint": "8.57.0",
@@ -9454,9 +9454,9 @@
       }
     },
     "node_modules/decentraland-ui2": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/decentraland-ui2/-/decentraland-ui2-0.6.0.tgz",
-      "integrity": "sha512-Wgsge+Yt4pJPR7nAD2ATEvNeS0IOD/kbLeVhozCFnTToMr1qZNklPCvEc+pX5JAXqIQur5kb86b4lR7sV7SqhQ==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/decentraland-ui2/-/decentraland-ui2-0.6.1.tgz",
+      "integrity": "sha512-DmQeKsAdgcCw60BWSxGa8R/e3mwyugXkBifd1rNZ24J+AdgKz36wG9nU/MYG2KNpZgftQQw7OcgMAzq6zBfctw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/package.json b/package.json
index d3877df7..c03ff496 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@vitejs/plugin-react": "^4.3.1",
     "classnames": "^2.5.1",
     "cross-env": "7.0.3",
-    "decentraland-ui2": "^0.6.0",
+    "decentraland-ui2": "^0.6.1",
     "electron": "31.1.0",
     "electron-builder": "24.13.3",
     "eslint": "8.57.0",
diff --git a/packages/main/src/modules/bin.ts b/packages/main/src/modules/bin.ts
index 89d6ec06..eb154cce 100644
--- a/packages/main/src/modules/bin.ts
+++ b/packages/main/src/modules/bin.ts
@@ -186,17 +186,23 @@ export class StreamError extends ErrorBase<Error> {
   }
 }
 
+export type StreamType = 'all' | 'stdout' | 'stderr';
+
 export type Child = {
   pkg: string;
   bin: string;
   args: string[];
   cwd: string;
   process: Electron.UtilityProcess;
-  on: (pattern: RegExp, handler: (data?: string) => void) => number;
-  once: (pattern: RegExp, handler: (data?: string) => void) => number;
+  on: (pattern: RegExp, handler: (data?: string) => void, streamType?: StreamType) => number;
+  once: (pattern: RegExp, handler: (data?: string) => void, streamType?: StreamType) => number;
   off: (index: number) => void;
   wait: () => Promise<Buffer>;
-  waitFor: (resolvePattern: RegExp, rejectPattern?: RegExp) => Promise<string>;
+  waitFor: (
+    resolvePattern: RegExp,
+    rejectPattern?: RegExp,
+    opts?: { resolve?: StreamType; reject?: StreamType },
+  ) => Promise<string>;
   kill: () => Promise<void>;
   alive: () => boolean;
 };
@@ -205,6 +211,7 @@ type Matcher = {
   pattern: RegExp;
   handler: (data: string) => void;
   enabled: boolean;
+  streamType: StreamType;
 };
 
 type RunOptions = {
@@ -245,13 +252,13 @@ export function run(pkg: string, bin: string, options: RunOptions = {}): Child {
 
   const stdout: Uint8Array[] = [];
   forked.stdout!.on('data', (data: Buffer) => {
-    handleData(data, matchers);
+    handleData(data, matchers, 'stdout');
     stdout.push(Uint8Array.from(data));
   });
 
   const stderr: Uint8Array[] = [];
   forked.stderr!.on('data', (data: Buffer) => {
-    handleData(data, matchers);
+    handleData(data, matchers, 'stderr');
     stderr.push(Uint8Array.from(data));
   });
 
@@ -287,30 +294,27 @@ export function run(pkg: string, bin: string, options: RunOptions = {}): Child {
     }
   });
 
-  function handleStream(stream: NodeJS.ReadableStream) {
-    stream!.on('data', (data: Buffer) => handleData(data, matchers));
-  }
-
-  handleStream(forked.stdout!);
-  handleStream(forked.stderr!);
-
   const child: Child = {
     pkg,
     bin,
     args,
     cwd,
     process: forked,
-    on: (pattern, handler) => {
+    on: (pattern, handler, streamType = 'all') => {
       if (alive) {
-        return matchers.push({ pattern, handler, enabled: true }) - 1;
+        return matchers.push({ pattern, handler, enabled: true, streamType }) - 1;
       }
       throw new Error('Process has been killed');
     },
-    once: (pattern, handler) => {
-      const index = child.on(pattern, data => {
-        handler(data);
-        child.off(index);
-      });
+    once: (pattern, handler, streamType) => {
+      const index = child.on(
+        pattern,
+        data => {
+          handler(data);
+          child.off(index);
+        },
+        streamType,
+      );
       return index;
     },
     off: index => {
@@ -319,11 +323,11 @@ export function run(pkg: string, bin: string, options: RunOptions = {}): Child {
       }
     },
     wait: () => promise,
-    waitFor: (resolvePattern, rejectPattern) =>
+    waitFor: (resolvePattern, rejectPattern, opts) =>
       new Promise((resolve, reject) => {
-        child.once(resolvePattern, data => resolve(data!));
+        child.once(resolvePattern, data => resolve(data!), opts?.resolve);
         if (rejectPattern) {
-          child.once(rejectPattern, data => reject(new Error(data)));
+          child.once(rejectPattern, data => reject(new Error(data)), opts?.reject);
         }
       }),
     kill: async () => {
@@ -382,14 +386,21 @@ export function run(pkg: string, bin: string, options: RunOptions = {}): Child {
   return child;
 }
 
-async function handleData(buffer: Buffer, matchers: Matcher[]) {
+async function handleData(buffer: Buffer, matchers: Matcher[], type: StreamType) {
   const data = buffer.toString('utf8');
   log.info(`[UtilityProcess] ${data}`); // pipe data to console
-  for (const { pattern, handler, enabled } of matchers) {
+  for (const { pattern, handler, enabled, streamType } of matchers) {
     if (!enabled) continue;
+    if (streamType !== 'all' && streamType !== type) continue;
     pattern.lastIndex = 0; // reset regexp
     if (pattern.test(data)) {
-      handler(data);
+      // remove control characters from data
+      const text = data.replace(
+        // eslint-disable-next-line no-control-regex
+        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+        '',
+      );
+      handler(text);
     }
   }
 }
diff --git a/packages/main/src/modules/cli.ts b/packages/main/src/modules/cli.ts
index 35ceb296..30cd2737 100644
--- a/packages/main/src/modules/cli.ts
+++ b/packages/main/src/modules/cli.ts
@@ -44,6 +44,7 @@ export async function deploy({ path, target, targetContent }: DeployOptions) {
   deployServer = run('@dcl/sdk-commands', 'sdk-commands', {
     args: [
       'deploy',
+      '--no-browser',
       '--port',
       port.toString(),
       ...(target ? ['--target', target] : []),
@@ -54,7 +55,11 @@ export async function deploy({ path, target, targetContent }: DeployOptions) {
   });
 
   // App ready at
-  await deployServer.waitFor(/app ready at/i);
+  await deployServer.waitFor(/listening/i, /error:/i, { reject: 'stderr' });
+
+  deployServer.waitFor(/close the terminal/gi).then(() => deployServer?.kill());
+
+  deployServer.wait().catch(); // handle rejection of main promise to avoid warnings in console
 
   return port;
 }
diff --git a/packages/main/src/modules/electron.ts b/packages/main/src/modules/electron.ts
index 17a767d1..9f299386 100644
--- a/packages/main/src/modules/electron.ts
+++ b/packages/main/src/modules/electron.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 import fs from 'fs/promises';
-import { app, BrowserWindow, dialog, type OpenDialogOptions, shell } from 'electron';
+import { app, BrowserWindow, clipboard, dialog, type OpenDialogOptions, shell } from 'electron';
 
 export function getHome() {
   return app.getPath('home');
@@ -35,3 +35,7 @@ export async function openExternal(url: string) {
 export async function getAppVersion() {
   return app.getVersion();
 }
+
+export async function copyToClipboard(text: string) {
+  clipboard.writeText(text);
+}
diff --git a/packages/main/src/modules/handle.ts b/packages/main/src/modules/handle.ts
index 179fd5df..9f55a631 100644
--- a/packages/main/src/modules/handle.ts
+++ b/packages/main/src/modules/handle.ts
@@ -1,6 +1,6 @@
 import { ipcMain } from 'electron';
 import log from 'electron-log';
-import type { Ipc } from '/shared/types/ipc';
+import type { Ipc, IpcError, IpcResult } from '/shared/types/ipc';
 
 // wrapper for ipcMain.handle with types
 export async function handle<T extends keyof Ipc>(
@@ -14,11 +14,19 @@ export async function handle<T extends keyof Ipc>(
           .map((arg, idx) => `args[${idx}]=${JSON.stringify(arg)}`)
           .join(' ')}`.trim(),
       );
-      const result = await handler(event, ...(args as Parameters<Ipc[T]>));
+      const value = await handler(event, ...(args as Parameters<Ipc[T]>));
+      const result: IpcResult<typeof value> = {
+        success: true,
+        value,
+      };
       return result;
     } catch (error: any) {
       log.error(`[IPC] channel=${channel} error=${error.message}`);
-      throw error;
+      const result: IpcError = {
+        success: false,
+        error: error.message,
+      };
+      return result;
     }
   });
 }
diff --git a/packages/main/src/modules/ipc.ts b/packages/main/src/modules/ipc.ts
index 6aaf6c9d..20fc1c25 100644
--- a/packages/main/src/modules/ipc.ts
+++ b/packages/main/src/modules/ipc.ts
@@ -15,6 +15,7 @@ export function initIpc() {
   );
   handle('electron.showOpenDialog', (_event, opts) => electron.showOpenDialog(opts));
   handle('electron.openExternal', (_event, url) => electron.openExternal(url));
+  handle('electron.copyToClipboard', (_event, text) => electron.copyToClipboard(text));
 
   // inspector
   handle('inspector.start', () => inspector.start());
diff --git a/packages/preload/src/modules/editor.ts b/packages/preload/src/modules/editor.ts
index 670ddf6f..2cb503c3 100644
--- a/packages/preload/src/modules/editor.ts
+++ b/packages/preload/src/modules/editor.ts
@@ -2,10 +2,6 @@ import type { DeployOptions } from '/shared/types/ipc';
 
 import { invoke } from './invoke';
 
-export async function getWorkspaceConfigPath(_path: string) {
-  return invoke('electron.getWorkspaceConfigPath', _path);
-}
-
 export async function getVersion() {
   return invoke('electron.getAppVersion');
 }
diff --git a/packages/preload/src/modules/invoke.ts b/packages/preload/src/modules/invoke.ts
index 5bbda222..c25d2ebe 100644
--- a/packages/preload/src/modules/invoke.ts
+++ b/packages/preload/src/modules/invoke.ts
@@ -1,10 +1,17 @@
 import { ipcRenderer } from 'electron';
-import type { Ipc } from '/shared/types/ipc';
+import type { Ipc, IpcError, IpcResult } from '/shared/types/ipc';
 
 // wrapper for ipcRenderer.invoke with types
 export async function invoke<T extends keyof Ipc>(
   channel: T,
   ...args: Parameters<Ipc[T]>
 ): Promise<ReturnType<Ipc[T]>> {
-  return ipcRenderer.invoke(channel, ...args);
+  const result = await (ipcRenderer.invoke(channel, ...args) as Promise<
+    IpcResult<ReturnType<Ipc[T]>> | IpcError
+  >);
+  if (result.success) {
+    return result.value;
+  } else {
+    throw new Error(result.error);
+  }
 }
diff --git a/packages/preload/src/modules/misc.ts b/packages/preload/src/modules/misc.ts
index 0caeac70..84ed37ce 100644
--- a/packages/preload/src/modules/misc.ts
+++ b/packages/preload/src/modules/misc.ts
@@ -6,3 +6,7 @@ export async function openExternal(url: string) {
   if (!isUrl(url)) throw new Error('Invalid URL provided');
   await invoke('electron.openExternal', url);
 }
+
+export async function copyToClipboard(text: string) {
+  await invoke('electron.copyToClipboard', text);
+}
diff --git a/packages/preload/src/modules/workspace.ts b/packages/preload/src/modules/workspace.ts
index 4d13923e..e733ec3e 100644
--- a/packages/preload/src/modules/workspace.ts
+++ b/packages/preload/src/modules/workspace.ts
@@ -7,6 +7,7 @@ import { type DependencyState, SortBy, type Project } from '/shared/types/projec
 import { PACKAGES_LIST } from '/shared/types/pkg';
 import { DEFAULT_DEPENDENCY_UPDATE_STRATEGY } from '/shared/types/settings';
 import type { Template, Workspace } from '/shared/types/workspace';
+import { FileSystemStorage } from '/shared/types/storage';
 
 import { getConfig, setConfig } from './config';
 import { exists, writeFile as deepWriteFile } from './fs';
@@ -18,7 +19,6 @@ import { getDefaultScenesPath, getScenesPath } from './settings';
 import { getScene } from './scene';
 
 import { DEFAULT_THUMBNAIL, NEW_SCENE_NAME, EMPTY_SCENE_TEMPLATE_REPO } from './constants';
-import { getWorkspaceConfigPath } from './editor';
 import { getProjectId } from './analytics';
 
 /**
@@ -54,7 +54,7 @@ export async function hasNodeModules(_path: string) {
 }
 
 export async function getOldProjectThumbnailPath(_path: string) {
-  const workspaceConfigPath = await getWorkspaceConfigPath(_path);
+  const workspaceConfigPath = await getConfigPath(_path);
   return path.join(workspaceConfigPath, 'images', 'project-thumbnail.png');
 }
 
@@ -374,3 +374,14 @@ export async function openFolder(_path: string) {
   const error = await shell.openPath(_path);
   if (error) throw new Error(error);
 }
+
+export async function getConfigPath(_path: string) {
+  return invoke('electron.getWorkspaceConfigPath', _path);
+}
+
+export async function getProjectInfo(_path: string) {
+  const configPath = await getConfigPath(_path);
+  const projectInfoPath = path.join(configPath, 'project.json');
+  const projectInfo = await FileSystemStorage.getOrCreate(projectInfoPath);
+  return projectInfo;
+}
diff --git a/packages/renderer/src/components/Button/styles.css b/packages/renderer/src/components/Button/styles.css
index 531edc3d..5862e56b 100644
--- a/packages/renderer/src/components/Button/styles.css
+++ b/packages/renderer/src/components/Button/styles.css
@@ -45,3 +45,15 @@
 .Button.MuiButton-colorInfo:hover {
   background-color: var(--light-gray);
 }
+
+.Button.MuiButton-outlined {
+  color: var(--dcl) !important;
+  background-color: transparent;
+  border-color: var(--dcl);
+}
+
+.Button.MuiButton-outlined:hover {
+  color: var(--dcl) !important;
+  background-color: transparent;
+  border-color: var(--dcl-dark);
+}
diff --git a/packages/renderer/src/components/EditorPage/component.tsx b/packages/renderer/src/components/EditorPage/component.tsx
index c3830302..73ed9c9d 100644
--- a/packages/renderer/src/components/EditorPage/component.tsx
+++ b/packages/renderer/src/components/EditorPage/component.tsx
@@ -8,7 +8,6 @@ import PublicIcon from '@mui/icons-material/Public';
 
 import { useSelector } from '#store';
 
-import { DEPLOY_URLS } from '/shared/types/deploy';
 import { isWorkspaceError } from '/shared/types/workspace';
 
 import { t } from '/@/modules/store/translation/utils';
@@ -17,7 +16,7 @@ import { useEditor } from '/@/hooks/useEditor';
 
 import EditorPng from '/assets/images/editor.png';
 
-import { PublishProject, type StepValue } from '../Modals/PublishProject';
+import { PublishProject } from '../Modals/PublishProject';
 import { Button } from '../Button';
 import { Header } from '../Header';
 import { Row } from '../Row';
@@ -35,7 +34,6 @@ export function EditorPage() {
     saveAndGetThumbnail,
     inspectorPort,
     openPreview,
-    publishScene,
     openCode,
     updateScene,
     loadingPreview,
@@ -89,24 +87,6 @@ export function EditorPage() {
     setOpen(undefined);
   }, []);
 
-  const handleSubmitModal = useCallback(
-    ({ target, value }: StepValue) => {
-      switch (target) {
-        case 'worlds':
-          return publishScene({
-            targetContent: import.meta.env.VITE_WORLDS_SERVER || DEPLOY_URLS.WORLDS,
-          });
-        case 'test':
-          return publishScene({ target: import.meta.env.VITE_TEST_SERVER || DEPLOY_URLS.TEST });
-        case 'custom':
-          return publishScene({ target: value });
-        default:
-          return publishScene();
-      }
-    },
-    [isReady],
-  );
-
   // inspector url
   const htmlUrl = `http://localhost:${import.meta.env.VITE_INSPECTOR_PORT || inspectorPort}`;
   let binIndexJsUrl = `${htmlUrl}/bin/index.js`;
@@ -213,7 +193,6 @@ export function EditorPage() {
               open={open === 'publish'}
               project={project}
               onClose={handleCloseModal}
-              onSubmit={handleSubmitModal}
             />
           )}
         </>
diff --git a/packages/renderer/src/components/Loader/styles.css b/packages/renderer/src/components/Loader/styles.css
index 876f4e63..aade5f89 100644
--- a/packages/renderer/src/components/Loader/styles.css
+++ b/packages/renderer/src/components/Loader/styles.css
@@ -1,6 +1,6 @@
 .Loader {
   width: 100%;
-  height: 100vh;
+  height: 100%;
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishModal/component.tsx b/packages/renderer/src/components/Modals/PublishProject/PublishModal/component.tsx
new file mode 100644
index 00000000..49ffb743
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/PublishModal/component.tsx
@@ -0,0 +1,45 @@
+import { styled } from 'decentraland-ui2';
+import { Modal as BaseModal } from 'decentraland-ui2/dist/components/Modal/Modal';
+import { type ModalProps } from 'decentraland-ui2/dist/components/Modal/Modal.types';
+
+function noop() {}
+
+const Modal = styled(BaseModal)(props => ({
+  '& > .MuiPaper-root .MuiBox-root:first-child': {
+    paddingBottom: 8,
+  },
+  '& > .MuiPaper-root .MuiBox-root:first-child h5': {
+    lineHeight: '2em',
+  },
+  '& > .MuiPaper-root > h6': {
+    textAlign: 'center',
+    color: 'var(--dcl-silver)',
+  },
+  '& > .MuiBackdrop-root': {
+    transition: 'none!important',
+  },
+  '& > .MuiPaper-root': {
+    backgroundColor: 'var(--darker-gray)',
+    backgroundImage: 'none',
+  },
+  '& [aria-label="back"]':
+    props.onBack !== noop
+      ? {}
+      : {
+          opacity: 0,
+          cursor: 'default',
+        },
+}));
+
+export function PublishModal(props: React.PropsWithChildren<ModalProps>) {
+  const { onBack, ...rest } = props;
+  return (
+    <Modal
+      size="small"
+      {...rest}
+      onBack={onBack || noop}
+    >
+      {props.children}
+    </Modal>
+  );
+}
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishModal/index.ts b/packages/renderer/src/components/Modals/PublishProject/PublishModal/index.ts
new file mode 100644
index 00000000..d236bc7f
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/PublishModal/index.ts
@@ -0,0 +1 @@
+export { PublishModal } from './component';
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishToLand/component.tsx b/packages/renderer/src/components/Modals/PublishProject/PublishToLand/component.tsx
deleted file mode 100644
index 3d1840f8..00000000
--- a/packages/renderer/src/components/Modals/PublishProject/PublishToLand/component.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-import { Box, Button, Typography } from 'decentraland-ui2';
-import { Atlas } from 'decentraland-ui2/dist/components/Atlas/Atlas';
-import type { SceneParcels } from '@dcl/schemas';
-
-import { useSelector } from '#store';
-
-import { DEPLOY_URLS } from '/shared/types/deploy';
-import type { Project } from '/shared/types/projects';
-
-import { t } from '/@/modules/store/translation/utils';
-import { selectors as landSelectors } from '/@/modules/store/land';
-import { useEditor } from '/@/hooks/useEditor';
-import { useWorkspace } from '/@/hooks/useWorkspace';
-
-import { COLORS, type Coordinate } from './types';
-
-function calculateParcels(project: Project, point: Coordinate): Coordinate[] {
-  const [baseX, baseY] = project.scene.base.split(',').map(coord => parseInt(coord, 10));
-  return project.scene.parcels.map(parcel => {
-    const [x, y] = parcel.split(',').map(coord => parseInt(coord, 10));
-    return { x: x - baseX + point.x, y: y - baseY + point.y };
-  });
-}
-
-export function PublishToLand({ onClose }: { onClose: () => void }) {
-  const { project, publishScene } = useEditor();
-  const { updateProject, updateSceneJson } = useWorkspace();
-  const tiles = useSelector(state => state.land.tiles);
-  const landTiles = useSelector(state => landSelectors.getLandTiles(state.land));
-  const [hover, setHover] = useState<Coordinate>({ x: 0, y: 0 });
-  const [placement, setPlacement] = useState<Coordinate | null>(null);
-
-  if (!project) return null;
-
-  // Memoize the project parcels centered around the hover position
-  const projectParcels = useMemo(() => calculateParcels(project, hover), [project, hover]);
-
-  const handleClickPublish = useCallback(() => {
-    publishScene({ target: import.meta.env.VITE_CATALYST_SERVER || DEPLOY_URLS.CATALYST_SERVER });
-    onClose();
-  }, [publishScene, onClose]);
-
-  const handleHover = useCallback((x: number, y: number) => {
-    setHover({ x, y });
-  }, []);
-
-  const isHighlighted = useCallback(
-    (x: number, y: number) =>
-      !placement && projectParcels.some(parcel => parcel.x === x && parcel.y === y),
-    [placement, projectParcels],
-  );
-
-  const isPlaced = useCallback(
-    (x: number, y: number) => {
-      if (!placement) return false;
-      const placedParcels = calculateParcels(project, placement);
-      return placedParcels.some(parcel => parcel.x === x && parcel.y === y);
-    },
-    [project, placement],
-  );
-
-  const isValid = useMemo(() => {
-    return hover && projectParcels.every(({ x, y }) => !!landTiles[`${x},${y}`]);
-  }, [landTiles, hover, projectParcels]);
-
-  const strokeLayer = useCallback(
-    (x: number, y: number) => {
-      const placed = isPlaced(x, y);
-      if (isHighlighted(x, y) || placed) {
-        return {
-          color: isValid || placed ? COLORS.selectedStroke : COLORS.indicatorStroke,
-          scale: 1.5,
-        };
-      }
-      return null;
-    },
-    [isHighlighted, isValid, isPlaced],
-  );
-
-  const highlightLayer = useCallback(
-    (x: number, y: number) => {
-      const placed = isPlaced(x, y);
-      if (isHighlighted(x, y) || placed) {
-        return { color: isValid || placed ? COLORS.selected : COLORS.indicator, scale: 1.2 };
-      }
-      return null;
-    },
-    [isHighlighted, isValid, isPlaced],
-  );
-
-  const ownedLayer = useCallback(
-    (x: number, y: number) => {
-      const key = `${x},${y}`;
-      return landTiles[key] && landTiles[key].land.owner === tiles[key].owner
-        ? { color: COLORS.freeParcel }
-        : null;
-    },
-    [tiles, landTiles],
-  );
-
-  const handlePlacement = useCallback(
-    (x: number, y: number) => {
-      if (!isValid) return;
-
-      const newPlacement = { x, y };
-      setPlacement(newPlacement);
-
-      const sceneUpdates: SceneParcels = {
-        base: `${x},${y}`,
-        parcels: calculateParcels(project, newPlacement).map(({ x, y }) => `${x},${y}`),
-      };
-
-      updateSceneJson(project.path, { scene: sceneUpdates });
-      updateProject({
-        ...project,
-        scene: sceneUpdates,
-        worldConfiguration: undefined, // Cannot deploy to a LAND with a world configuration
-        updatedAt: Date.now(),
-      });
-    },
-    [project, isValid, updateProject, updateSceneJson],
-  );
-
-  const handleClearPlacement = useCallback(() => {
-    setPlacement(null);
-  }, []);
-
-  return (
-    <Box>
-      <Box
-        height={480}
-        style={{ backgroundColor: 'black' }}
-      >
-        {/* @ts-expect-error TODO: Update properties in UI2, making the not required `optional` */}
-        <Atlas
-          tiles={tiles}
-          layers={[strokeLayer, highlightLayer, ownedLayer]}
-          onHover={handleHover}
-          onClick={handlePlacement}
-          withZoomControls
-        />
-      </Box>
-      <Box
-        mt={4}
-        display="flex"
-        justifyContent="space-between"
-        alignItems="center"
-      >
-        <Box
-          flex={1}
-          display="flex"
-          padding={1}
-          mr={2}
-          sx={{ border: '1px solid grey', borderRadius: '8px' }}
-          justifyContent="center"
-          alignItems="baseline"
-          height={45}
-        >
-          <Typography variant="body1">
-            {placement
-              ? t('modal.publish_project.land.select_parcel.place_scene', {
-                  coords: `${placement.x},${placement.y}`,
-                })
-              : t('modal.publish_project.land.select_parcel.select_parcel')}
-          </Typography>
-          {placement && (
-            <Button
-              variant="text"
-              size="small"
-              onClick={handleClearPlacement}
-              sx={{ marginLeft: 1, padding: 0 }}
-            >
-              {t('modal.publish_project.land.select_parcel.actions.reset')}
-            </Button>
-          )}
-        </Box>
-        <Button
-          variant="contained"
-          color="primary"
-          size="large"
-          onClick={handleClickPublish}
-          disabled={!placement}
-          sx={{ height: '45px' }}
-        >
-          {t('modal.publish_project.land.select_parcel.actions.publish')}
-        </Button>
-      </Box>
-    </Box>
-  );
-}
diff --git a/packages/renderer/src/components/Modals/PublishProject/component.tsx b/packages/renderer/src/components/Modals/PublishProject/component.tsx
index 943b863c..7eed760e 100644
--- a/packages/renderer/src/components/Modals/PublishProject/component.tsx
+++ b/packages/renderer/src/components/Modals/PublishProject/component.tsx
@@ -1,183 +1,50 @@
-import { type ChangeEvent, useCallback, useState } from 'react';
-import { MenuItem, Select, type SelectChangeEvent } from 'decentraland-ui2';
-import { Modal } from 'decentraland-ui2/dist/components/Modal/Modal';
-
-import { misc } from '#preload';
-import { isUrl } from '/shared/utils';
-import { t } from '/@/modules/store/translation/utils';
-
-import GenesisPlazaPng from '/assets/images/genesis_plaza.png';
-import LandPng from '/assets/images/land.png';
-import WorldsPng from '/assets/images/worlds.png';
-
-import { Button } from '../../Button';
-import { OptionBox } from '../../EditorPage/OptionBox';
-import { PublishToWorld } from './PublishToWorld';
-import { PublishToLand } from './PublishToLand';
-
-import type { AlternativeTarget, Step, StepProps, StepValue, Props } from './types';
-
-import './styles.css';
-
-export function PublishProject({ open, project, onSubmit, onClose }: Props) {
-  const [step, setStep] = useState<Step>('initial');
-
-  const close = useCallback(() => {
-    setStep('initial');
-    onClose();
-  }, []);
-
-  const handleClose = useCallback(() => close(), []);
-
-  const handleChangeStep = useCallback(
-    (step: Step) => () => {
-      setStep(step);
-    },
-    [],
+import { useCallback, useMemo, useState } from 'react';
+import { Initial } from './steps/Initial';
+import { AlternativeServers } from './steps/AlternativeServers';
+import { PublishToWorld } from './steps/PublishToWorld';
+import { PublishToLand } from './steps/PublishToLand';
+import { Deploy } from './steps/Deploy';
+
+import type { Props, Step } from './types';
+
+export function PublishProject({ open, project, onClose }: Omit<Props, 'onStep'>) {
+  const [history, setHistory] = useState<Step[]>([]);
+  const step = useMemo<Step>(
+    () => (history.length > 0 ? history[history.length - 1] : 'initial'),
+    [history],
   );
 
-  const handleClickPublish = useCallback((value: StepValue) => {
-    onSubmit(value);
-    close();
-  }, []);
-
-  return (
-    <Modal
-      open={open}
-      title={
-        step !== 'publish-to-world'
-          ? t('modal.publish_project.title', { title: project.title })
-          : ''
-      }
-      onClose={handleClose}
-      size="small"
-      onBack={step !== 'initial' ? handleChangeStep('initial') : undefined}
-    >
-      {step === 'initial' && <Initial onStepChange={handleChangeStep} />}
-      {step === 'alternative-servers' && <AlternativeServers onClick={handleClickPublish} />}
-      {step === 'publish-to-land' && <PublishToLand onClose={onClose} />}
-      {step === 'publish-to-world' && <PublishToWorld onClose={onClose} />}
-    </Modal>
-  );
-}
-
-function Initial({ onStepChange }: { onStepChange: (step: Step) => () => void }) {
-  return (
-    <div className="Initial">
-      <span className="select">{t('modal.publish_project.select')}</span>
-      <div className="options">
-        <OptionBox
-          thumbnailSrc={WorldsPng}
-          title={t('modal.publish_project.worlds.title')}
-          description={t('modal.publish_project.worlds.description')}
-          buttonText={t('modal.publish_project.worlds.action')}
-          onClickPublish={onStepChange('publish-to-world')}
-          learnMoreUrl="https://docs.decentraland.org/creator/worlds/about/#publish-a-world"
-        />
-        <OptionBox
-          thumbnailSrc={LandPng}
-          title={t('modal.publish_project.land.title')}
-          description={t('modal.publish_project.land.description')}
-          buttonText={t('modal.publish_project.land.action')}
-          onClickPublish={onStepChange('publish-to-land')}
-          learnMoreUrl="https://docs.decentraland.org/creator/development-guide/sdk7/publishing-permissions/#land-permission-options"
-        />
-      </div>
-      <span
-        className="alternative_servers"
-        onClick={onStepChange('alternative-servers')}
-      >
-        {t('modal.publish_project.alternative_servers.title')}
-      </span>
-    </div>
-  );
-}
-
-function AlternativeServers({ onClick }: StepProps) {
-  const [option, setOption] = useState<AlternativeTarget>('test');
-  const [customUrl, setCustomUrl] = useState('');
-  const [error, setError] = useState('');
-
-  const handleClick = useCallback(() => {
-    if (option === 'custom' && !isUrl(customUrl)) {
-      return setError(t('modal.publish_project.alternative_servers.errors.url'));
-    }
-    const value: StepValue = { target: option, value: customUrl };
-    onClick(value);
-  }, [option, customUrl]);
+  const handleClose = useCallback(() => {
+    setHistory([]);
+    onClose();
+  }, [setHistory, onClose]);
 
-  const handleChangeSelect = useCallback((e: SelectChangeEvent<AlternativeTarget>) => {
-    setOption(e.target.value as AlternativeTarget);
-  }, []);
+  const handleBack = useCallback(() => {
+    setHistory(history => (history.length > 0 ? history.slice(0, -1) : []));
+  }, [history, setHistory]);
 
-  const handleChangeCustom = useCallback(
-    (e: ChangeEvent<HTMLInputElement>) => {
-      if (error) setError('');
-      setCustomUrl(e.target.value);
+  const handleStep = useCallback(
+    (newStep: Step) => {
+      setHistory(history => [...history, newStep]);
     },
-    [error],
+    [setHistory],
   );
 
-  const handleClickLearnMore = useCallback(() => {
-    if (option === 'custom') {
-      return misc.openExternal(
-        'https://docs.decentraland.org/creator/development-guide/sdk7/publishing/#custom-servers',
-      );
-    }
-    misc.openExternal(
-      'https://docs.decentraland.org/creator/development-guide/sdk7/publishing/#the-test-server',
-    );
-  }, [option]);
+  const props: Props = {
+    open,
+    project,
+    onClose: handleClose,
+    onBack: handleBack,
+    onStep: handleStep,
+  };
 
   return (
-    <div className="AlternativeServers">
-      <span className="select">{t('modal.publish_project.select')}</span>
-      <div className="box">
-        <div className="selection">
-          <div>
-            <h3>{t('modal.publish_project.alternative_servers.list')}</h3>
-            <Select
-              variant="standard"
-              value={option}
-              onChange={handleChangeSelect}
-            >
-              <MenuItem value="test">
-                {t('modal.publish_project.alternative_servers.options.test_server')}
-              </MenuItem>
-              <MenuItem value="custom">
-                {t('modal.publish_project.alternative_servers.options.custom_server')}
-              </MenuItem>
-            </Select>
-            {option === 'custom' && (
-              <div className="custom_input">
-                <span className="title">
-                  {t('modal.publish_project.alternative_servers.custom_server_url')}
-                </span>
-                <input
-                  value={customUrl}
-                  onChange={handleChangeCustom}
-                />
-                <span className="error">{error}</span>
-              </div>
-            )}
-          </div>
-          <img
-            className="thumbnail"
-            src={GenesisPlazaPng}
-          />
-        </div>
-        <div className="actions">
-          <span
-            className="learn-more"
-            onClick={handleClickLearnMore}
-          >
-            {t('option_box.learn_more')}
-          </span>
-          <Button onClick={handleClick}>
-            {t(`modal.publish_project.alternative_servers.action.${option}_server`)}
-          </Button>
-        </div>
-      </div>
-    </div>
+    <>
+      {step === 'initial' && <Initial {...props} />}
+      {step === 'alternative-servers' && <AlternativeServers {...props} />}
+      {step === 'publish-to-land' && <PublishToLand {...props} />}
+      {step === 'publish-to-world' && <PublishToWorld {...props} />}
+      {step === 'deploy' && <Deploy {...props} />}
+    </>
   );
 }
diff --git a/packages/renderer/src/components/Modals/PublishProject/index.ts b/packages/renderer/src/components/Modals/PublishProject/index.ts
index 0d3eda45..8e2b6e6f 100644
--- a/packages/renderer/src/components/Modals/PublishProject/index.ts
+++ b/packages/renderer/src/components/Modals/PublishProject/index.ts
@@ -1,3 +1,2 @@
 import { PublishProject } from './component';
-import type { StepValue } from './types';
-export { PublishProject, StepValue };
+export { PublishProject };
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/component.tsx b/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/component.tsx
new file mode 100644
index 00000000..54d45cd0
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/component.tsx
@@ -0,0 +1,115 @@
+import { type ChangeEvent, useCallback, useState } from 'react';
+import { Button, MenuItem, Select, type SelectChangeEvent } from 'decentraland-ui2';
+import { misc } from '#preload';
+import { t } from '/@/modules/store/translation/utils';
+import { isUrl } from '/shared/utils';
+import GenesisPlazaPng from '/assets/images/genesis_plaza.png';
+import type { AlternativeTarget, Props } from '../../types';
+
+import './styles.css';
+import { useEditor } from '/@/hooks/useEditor';
+import { PublishModal } from '../../PublishModal';
+
+export function AlternativeServers(props: Props) {
+  const { publishScene } = useEditor();
+  const [option, setOption] = useState<AlternativeTarget>('test');
+  const [customUrl, setCustomUrl] = useState('');
+  const [error, setError] = useState('');
+
+  const handleClick = useCallback(() => {
+    if (option === 'custom' && !isUrl(customUrl)) {
+      return setError(t('modal.publish_project.alternative_servers.errors.url'));
+    }
+    if (option === 'test') {
+      void publishScene();
+    } else if (option === 'custom') {
+      if (!isUrl(customUrl)) {
+        return setError(t('modal.publish_project.alternative_servers.errors.url'));
+      }
+      void publishScene({ target: customUrl });
+    } else {
+      throw new Error('Invalid option');
+    }
+    props.onStep('deploy');
+  }, [option, customUrl, props.onStep, publishScene]);
+
+  const handleChangeSelect = useCallback((e: SelectChangeEvent<AlternativeTarget>) => {
+    setOption(e.target.value as AlternativeTarget);
+  }, []);
+
+  const handleChangeCustom = useCallback(
+    (e: ChangeEvent<HTMLInputElement>) => {
+      if (error) setError('');
+      setCustomUrl(e.target.value);
+    },
+    [error],
+  );
+
+  const handleClickLearnMore = useCallback(() => {
+    if (option === 'custom') {
+      return misc.openExternal(
+        'https://docs.decentraland.org/creator/development-guide/sdk7/publishing/#custom-servers',
+      );
+    }
+    misc.openExternal(
+      'https://docs.decentraland.org/creator/development-guide/sdk7/publishing/#the-test-server',
+    );
+  }, [option]);
+
+  return (
+    <PublishModal
+      title={t('modal.publish_project.alternative_servers.title')}
+      subtitle={t('modal.publish_project.select')}
+      {...props}
+    >
+      <div className="AlternativeServers">
+        <div className="box">
+          <div className="selection">
+            <div>
+              <h3>{t('modal.publish_project.alternative_servers.list')}</h3>
+              <Select
+                variant="standard"
+                value={option}
+                onChange={handleChangeSelect}
+              >
+                <MenuItem value="test">
+                  {t('modal.publish_project.alternative_servers.options.test_server')}
+                </MenuItem>
+                <MenuItem value="custom">
+                  {t('modal.publish_project.alternative_servers.options.custom_server')}
+                </MenuItem>
+              </Select>
+              {option === 'custom' && (
+                <div className="custom_input">
+                  <span className="title">
+                    {t('modal.publish_project.alternative_servers.custom_server_url')}
+                  </span>
+                  <input
+                    value={customUrl}
+                    onChange={handleChangeCustom}
+                  />
+                  <span className="error">{error}</span>
+                </div>
+              )}
+            </div>
+            <img
+              className="thumbnail"
+              src={GenesisPlazaPng}
+            />
+          </div>
+          <div className="actions">
+            <span
+              className="learn-more"
+              onClick={handleClickLearnMore}
+            >
+              {t('option_box.learn_more')}
+            </span>
+            <Button onClick={handleClick}>
+              {t(`modal.publish_project.alternative_servers.action.${option}_server`)}
+            </Button>
+          </div>
+        </div>
+      </div>
+    </PublishModal>
+  );
+}
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/index.ts b/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/index.ts
new file mode 100644
index 00000000..33ff9f08
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/index.ts
@@ -0,0 +1 @@
+export { AlternativeServers } from './component';
diff --git a/packages/renderer/src/components/Modals/PublishProject/styles.css b/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/styles.css
similarity index 81%
rename from packages/renderer/src/components/Modals/PublishProject/styles.css
rename to packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/styles.css
index e14bdcae..f2d3990e 100644
--- a/packages/renderer/src/components/Modals/PublishProject/styles.css
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/AlternativeServers/styles.css
@@ -1,31 +1,5 @@
 /* TODO: update the Modal component in ui2 to allow providing a className to the Material Modal...*/
 
-/* Initial Modal */
-.MuiModal-root .Initial {
-  display: flex;
-  flex-direction: column;
-}
-
-.MuiModal-root .Initial .select,
-.MuiModal-root .Initial .alternative_servers {
-  text-align: center;
-}
-
-.MuiModal-root .Initial .options {
-  display: flex;
-  margin: 20px 0;
-}
-
-.MuiModal-root .Initial .options .OptionBox + .OptionBox {
-  margin-left: 20px;
-}
-
-.MuiModal-root .Initial .alternative_servers {
-  text-decoration: underline;
-  text-transform: uppercase;
-  cursor: pointer;
-}
-
 /* AlternativeServers Modal */
 .MuiModal-root .AlternativeServers {
   display: flex;
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/component.tsx b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/component.tsx
new file mode 100644
index 00000000..984e5d49
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/component.tsx
@@ -0,0 +1,375 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { type AuthChain, Authenticator } from '@dcl/crypto';
+import { localStorageGetIdentity } from '@dcl/single-sign-on-client';
+import { ChainId } from '@dcl/schemas';
+import { Typography, Checkbox } from 'decentraland-ui2';
+import { misc, workspace } from '#preload';
+import type { IFileSystemStorage } from '/shared/types/storage';
+import { t } from '/@/modules/store/translation/utils';
+import { Loader } from '/@/components/Loader';
+import { useEditor } from '/@/hooks/useEditor';
+import { useIsMounted } from '/@/hooks/useIsMounted';
+import { useAuth } from '/@/hooks/useAuth';
+import { addBase64ImagePrefix } from '/@/modules/image';
+import { PublishModal } from '../../PublishModal';
+import { Button } from '../../../../Button';
+import { type Props } from '../../types';
+import type { File, Info } from './types';
+import './styles.css';
+
+const MAX_FILE_PATH_LENGTH = 50;
+
+function getPath(filename: string) {
+  return filename.length > MAX_FILE_PATH_LENGTH
+    ? `${filename.slice(0, MAX_FILE_PATH_LENGTH / 2)}...${filename.slice(
+        -(MAX_FILE_PATH_LENGTH / 2),
+      )}`
+    : filename;
+}
+
+const KB = 1024;
+const MB = KB * 1024;
+const GB = MB * 1024;
+
+function getSize(size: number) {
+  if (size < KB) {
+    return `${size.toFixed(2)} B`;
+  }
+  if (size < MB) {
+    return `${(size / KB).toFixed(2)} KB`;
+  }
+  if (size < GB) {
+    return `${(size / MB).toFixed(2)} MB`;
+  }
+  return `${(size / GB).toFixed(2)} GB`;
+}
+
+export function Deploy(props: Props) {
+  const infoRef = useRef<IFileSystemStorage>();
+  const { chainId, wallet, avatar } = useAuth();
+  const [files, setFiles] = useState<File[]>([]);
+  const [info, setInfo] = useState<Info | null>(null);
+  const { loadingPublish, publishPort, project, publishError } = useEditor();
+  const isMounted = useIsMounted();
+  const [isDeploying, setIsDeploying] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [isSuccessful, setIsSuccessful] = useState(false);
+  const [showWarning, setShowWarning] = useState(false);
+  const [skipWarning, setSkipWarning] = useState(false);
+
+  // read skip warning flag
+  useEffect(() => {
+    if (project) {
+      workspace.getProjectInfo(project.path).then(info => {
+        info.get<boolean>('skipPublishWarning').then(value => {
+          setSkipWarning(!!value);
+        });
+        infoRef.current = info;
+      });
+    }
+  }, [project]);
+
+  const url = useMemo(() => {
+    const port = import.meta.env.VITE_CLI_DEPLOY_PORT || publishPort;
+    return port ? `http://localhost:${port}/api` : null;
+  }, [publishPort]);
+
+  const handlePublish = useCallback(() => {
+    if (!url) return;
+    setShowWarning(false);
+    async function deploy(payload: { address: string; authChain: AuthChain; chainId: ChainId }) {
+      setIsDeploying(true);
+      setError(null);
+      const resp = await fetch(`${url}/deploy`, {
+        method: 'post',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(payload),
+      });
+      if (resp.ok) {
+        return;
+      }
+      let error = (await resp.json()).message as string;
+      if (/Response was/.test(error)) {
+        try {
+          error = error.split('["')[1].split('"]')[0];
+        } catch (e) {
+          /* */
+        }
+      }
+      throw new Error(error);
+    }
+    if (wallet && info && info.rootCID) {
+      const identity = localStorageGetIdentity(wallet);
+      if (identity && chainId) {
+        const authChain = Authenticator.signPayload(identity, info.rootCID);
+        void deploy({ address: wallet, authChain, chainId })
+          .then(() => {
+            if (!isMounted()) return;
+            setIsDeploying(false);
+            setIsSuccessful(true);
+          })
+          .catch(error => {
+            setIsDeploying(false);
+            setError(error.message);
+          });
+      } else {
+        setError('Invalid identity or chainId');
+      }
+    }
+    // write skip warning flag
+    infoRef.current?.set('skipPublishWarning', skipWarning);
+  }, [wallet, info, url, chainId, skipWarning]);
+
+  const handleBack = useCallback(() => {
+    setShowWarning(false);
+    setSkipWarning(false);
+  }, []);
+
+  useEffect(() => {
+    if (!url || isSuccessful) return;
+    async function fetchFiles() {
+      const resp = await fetch(`${url}/files`);
+      const files = await resp.json();
+      return files as File[];
+    }
+    async function fetchInfo() {
+      const resp = await fetch(`${url}/info`);
+      const info = await resp.json();
+      return info as Info;
+    }
+    void Promise.all([fetchFiles(), fetchInfo()])
+      .then(([files, info]) => {
+        if (!isMounted()) return;
+        setFiles(files);
+        setInfo(info);
+      })
+      .catch();
+  }, [url, isSuccessful]);
+
+  // set publish error
+  useEffect(() => {
+    if (publishError) {
+      setError(publishError);
+    }
+  }, [publishError, setError]);
+
+  // jump in
+  const jumpInUrl = useMemo(() => {
+    if (info && project) {
+      if (info.isWorld) {
+        if (project.worldConfiguration) {
+          return `http://decentraland.org/play/world/${project.worldConfiguration.name}`;
+        }
+      } else {
+        return `http://decentraland.org/play?position=${project.scene.base}`;
+      }
+    }
+    return null;
+  }, [info, project]);
+
+  const handleJumpIn = useCallback(() => {
+    if (info && project) {
+      if (info.isWorld) {
+        if (project.worldConfiguration) {
+          void misc.openExternal(`decentraland://?realm=${project.worldConfiguration.name}`);
+        }
+      } else {
+        void misc.openExternal(`decentraland://?position=${project.scene.base}`);
+      }
+    }
+  }, [info, project]);
+
+  return (
+    <PublishModal
+      title={
+        info
+          ? info.isWorld
+            ? 'Publish to your World'
+            : 'Publish to your Land'
+          : loadingPublish
+            ? 'Loading...'
+            : error
+              ? 'Error'
+              : ''
+      }
+      size="large"
+      {...props}
+    >
+      <div className="Deploy">
+        {showWarning ? (
+          <div className="publish-warning">
+            <div className="content">
+              <div className="Warning" />
+              <div className="message">
+                {t('modal.publish_project.deploy.warning.message', {
+                  ul: (child: string) => <ul>{child}</ul>,
+                  li: (child: string) => <li>{child}</li>,
+                })}
+              </div>
+            </div>
+            <div className="actions">
+              <label className="dont-show-again">
+                <Checkbox
+                  value={skipWarning}
+                  onChange={() => setSkipWarning(!skipWarning)}
+                />
+                {t('modal.publish_project.deploy.warning.checkbox')}
+              </label>
+              <span className="buttons">
+                <Button
+                  variant="outlined"
+                  size="medium"
+                  onClick={handleBack}
+                >
+                  {t('modal.publish_project.deploy.warning.back')}
+                </Button>
+                <Button
+                  size="medium"
+                  onClick={handlePublish}
+                >
+                  {t('modal.publish_project.deploy.warning.continue')}
+                </Button>
+              </span>
+            </div>
+          </div>
+        ) : null}
+        {loadingPublish ? (
+          <Loader />
+        ) : error ? (
+          <>
+            <div className="cli-publish-error">
+              <div className="Warning" />
+              <p className="message">{error}</p>
+            </div>
+          </>
+        ) : !info ? null : (
+          <>
+            <div className="ethereum">
+              <div className="chip network">
+                {chainId === ChainId.ETHEREUM_MAINNET
+                  ? t('modal.publish_project.deploy.ethereum.mainnet')
+                  : t('modal.publish_project.deploy.ethereum.testnet')}
+              </div>
+              {wallet ? (
+                <div className="chip address">
+                  {wallet.slice(0, 6)}...{wallet.slice(-4)}
+                </div>
+              ) : null}
+              {info.isWorld ? (
+                avatar ? (
+                  <div className="chip username">
+                    {avatar.name}
+                    {avatar.hasClaimedName ? <i className="verified"></i> : null}
+                  </div>
+                ) : null
+              ) : (
+                <div className="chip parcel">
+                  <i className="pin"></i>
+                  {info.baseParcel}
+                </div>
+              )}
+            </div>
+            <div className="scene">
+              <div className="info">
+                {project ? (
+                  <div
+                    className="thumbnail"
+                    style={{ backgroundImage: `url(${addBase64ImagePrefix(project.thumbnail)})` }}
+                  />
+                ) : null}
+                <div className="text">
+                  <Typography variant="body1">{info.title}</Typography>
+                  <Typography
+                    variant="body2"
+                    color="#A09BA8"
+                  >
+                    {info.description}
+                  </Typography>
+                </div>
+              </div>
+              {!isSuccessful ? (
+                <div className="files">
+                  <div className="filters">
+                    <div className="count">
+                      {t('modal.publish_project.deploy.files.count', { count: files.length })}
+                    </div>
+                    <div className="size">
+                      {t('modal.publish_project.deploy.files.size', {
+                        size: getSize(files.reduce((total, file) => total + file.size, 0)),
+                        b: (child: string) => <b>{child}</b>,
+                      })}
+                    </div>
+                  </div>
+                  <div className="list">
+                    {files.map(file => (
+                      <div
+                        className="file"
+                        key={file.name}
+                      >
+                        <div
+                          className="filename"
+                          title={file.name}
+                        >
+                          {getPath(file.name)}
+                        </div>
+                        <div className="size">{getSize(file.size)}</div>
+                      </div>
+                    ))}
+                  </div>
+                  <div className="actions">
+                    <p className="error">{error}</p>
+                    <Button
+                      size="large"
+                      disabled={isDeploying || isSuccessful}
+                      onClick={() => (skipWarning ? handlePublish() : setShowWarning(true))}
+                    >
+                      {t('modal.publish_project.deploy.files.publish')}
+                      {isDeploying ? <Loader size={20} /> : <i className="deploy-icon" />}
+                    </Button>
+                  </div>
+                </div>
+              ) : (
+                <div className="success">
+                  <div className="content">
+                    <i className="success-icon" />
+                    <div className="message">
+                      {t('modal.publish_project.deploy.success.message')}
+                    </div>
+                    <div className="jump-in-url">
+                      <label>
+                        {t('modal.publish_project.deploy.success.url', {
+                          target: info.isWorld
+                            ? t('modal.publish_project.deploy.success.world')
+                            : t('modal.publish_project.deploy.success.land'),
+                        })}
+                      </label>
+                      <div className="url">
+                        {jumpInUrl}
+                        <i
+                          className="copy-icon"
+                          onClick={() => jumpInUrl && misc.copyToClipboard(jumpInUrl)}
+                        />
+                      </div>
+                    </div>
+                  </div>
+                  <div className="actions">
+                    <Button
+                      size="large"
+                      disabled={!isSuccessful}
+                      onClick={handleJumpIn}
+                    >
+                      {t('modal.publish_project.deploy.success.jump_in')}
+                      <i className="jump-in-icon" />
+                    </Button>
+                  </div>
+                </div>
+              )}
+            </div>
+          </>
+        )}
+      </div>
+    </PublishModal>
+  );
+}
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/copy.svg b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/copy.svg
new file mode 100644
index 00000000..79c78bb4
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/copy.svg
@@ -0,0 +1,13 @@
+<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_13996_5637)">
+    <path
+      d="M13.3242 0.960938H4.32422C3.49922 0.960938 2.82422 1.63594 2.82422 2.46094V12.9609H4.32422V2.46094H13.3242V0.960938ZM15.5742 3.96094H7.32422C6.49922 3.96094 5.82422 4.63594 5.82422 5.46094V15.9609C5.82422 16.7859 6.49922 17.4609 7.32422 17.4609H15.5742C16.3992 17.4609 17.0742 16.7859 17.0742 15.9609V5.46094C17.0742 4.63594 16.3992 3.96094 15.5742 3.96094ZM15.5742 15.9609H7.32422V5.46094H15.5742V15.9609Z"
+      fill="#A09BA8" />
+  </g>
+  <defs>
+    <clipPath id="clip0_13996_5637">
+      <rect width="18" height="18" fill="white" transform="translate(0.949219 0.210938)" />
+    </clipPath>
+  </defs>
+</svg>
+  
\ No newline at end of file
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/deploy.svg b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/deploy.svg
new file mode 100644
index 00000000..93cf28cd
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/deploy.svg
@@ -0,0 +1,5 @@
+<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M2.84984 21L23.8398 12L2.84984 3L2.83984 10L17.8398 12L2.83984 14L2.84984 21Z"
+    fill="white" />
+</svg>
+  
\ No newline at end of file
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/jump-in.svg b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/jump-in.svg
new file mode 100644
index 00000000..f80b5781
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/jump-in.svg
@@ -0,0 +1,8 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1.69922" y="0.960938" width="22.5" height="22.5" rx="7.25" stroke="#FCFCFC"
+    stroke-opacity="0.3" stroke-width="1.5" />
+  <path
+    d="M19.6623 11.276L14.9852 6.60121C14.1514 5.76788 12.7483 6.35731 12.7483 7.53617V9.08087C12.7076 9.08087 12.6873 9.08087 12.6466 9.08087H8.21012C7.45772 9.08087 6.84766 9.6703 6.84766 10.4223V13.9792C6.84766 14.7312 7.45772 15.341 8.21012 15.341H12.6263C12.6669 15.341 12.6873 15.341 12.7279 15.341V16.8857C12.7279 18.0646 14.1514 18.654 14.9648 17.8207L19.642 13.1459C20.1707 12.6174 20.1707 11.7841 19.6623 11.276Z"
+    fill="white" />
+</svg>
+  
\ No newline at end of file
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/pin.svg b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/pin.svg
new file mode 100644
index 00000000..d8f3ea56
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/pin.svg
@@ -0,0 +1,6 @@
+<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M9.83984 1.5C6.93734 1.5 4.58984 3.8475 4.58984 6.75C4.58984 10.6875 9.83984 16.5 9.83984 16.5C9.83984 16.5 15.0898 10.6875 15.0898 6.75C15.0898 3.8475 12.7423 1.5 9.83984 1.5ZM9.83984 8.625C8.80484 8.625 7.96484 7.785 7.96484 6.75C7.96484 5.715 8.80484 4.875 9.83984 4.875C10.8748 4.875 11.7148 5.715 11.7148 6.75C11.7148 7.785 10.8748 8.625 9.83984 8.625Z"
+    fill="white" />
+</svg>
+  
\ No newline at end of file
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/success.svg b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/success.svg
new file mode 100644
index 00000000..9f1a2ffe
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/success.svg
@@ -0,0 +1,14 @@
+<svg width="85" height="65" viewBox="0 0 85 65" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M27.6278 50.7046L7.72625 30.803L0.949219 37.5323L27.6278 64.2109L84.8985 6.94024L78.1692 0.210938L27.6278 50.7046Z"
+    fill="url(#paint0_linear_13996_5627)" />
+  <defs>
+    <linearGradient id="paint0_linear_13996_5627" x1="0.949217" y1="0.210866" x2="89.2301"
+      y2="57.5408" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFBC5B" />
+      <stop offset="0.505208" stop-color="#FF2D55" />
+      <stop offset="1" stop-color="#C640CD" />
+    </linearGradient>
+  </defs>
+</svg>
+  
\ No newline at end of file
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/verified.svg b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/verified.svg
new file mode 100644
index 00000000..046adbcd
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/verified.svg
@@ -0,0 +1,29 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <mask id="path-2-outside-1_13984_18011" maskUnits="userSpaceOnUse" x="0.09375" y="0.258789"
+    width="16" height="16" fill="black">
+    <rect fill="white" x="0.09375" y="0.258789" width="16" height="16" />
+    <path fill-rule="evenodd" clip-rule="evenodd"
+      d="M9.00293 1.69813C8.41714 1.11234 7.46739 1.11234 6.8816 1.69813L5.75442 2.82532H4.16011C3.33169 2.82532 2.66011 3.49689 2.66011 4.32532V5.91962L1.53309 7.04664C0.947303 7.63243 0.947304 8.58218 1.53309 9.16797L2.66011 10.295V11.8893C2.66011 12.7177 3.33169 13.3893 4.16012 13.3893H5.75438L6.88161 14.5165C7.46739 15.1023 8.41714 15.1023 9.00293 14.5165L10.1301 13.3893H11.7241C12.5525 13.3893 13.2241 12.7177 13.2241 11.8893V10.2953L14.3514 9.16796C14.9372 8.58218 14.9372 7.63243 14.3514 7.04664L13.2241 5.91926V4.32532C13.2241 3.49689 12.5525 2.82532 11.7241 2.82532H10.1301L9.00293 1.69813Z" />
+  </mask>
+  <path fill-rule="evenodd" clip-rule="evenodd"
+    d="M9.00293 1.69813C8.41714 1.11234 7.46739 1.11234 6.8816 1.69813L5.75442 2.82532H4.16011C3.33169 2.82532 2.66011 3.49689 2.66011 4.32532V5.91962L1.53309 7.04664C0.947303 7.63243 0.947304 8.58218 1.53309 9.16797L2.66011 10.295V11.8893C2.66011 12.7177 3.33169 13.3893 4.16012 13.3893H5.75438L6.88161 14.5165C7.46739 15.1023 8.41714 15.1023 9.00293 14.5165L10.1301 13.3893H11.7241C12.5525 13.3893 13.2241 12.7177 13.2241 11.8893V10.2953L14.3514 9.16796C14.9372 8.58218 14.9372 7.63243 14.3514 7.04664L13.2241 5.91926V4.32532C13.2241 3.49689 12.5525 2.82532 11.7241 2.82532H10.1301L9.00293 1.69813Z"
+    fill="url(#paint0_linear_13984_18011)" />
+  <path
+    d="M6.8816 1.69813L7.58871 2.40524V2.40524L6.8816 1.69813ZM9.00293 1.69813L8.29582 2.40523V2.40524L9.00293 1.69813ZM5.75442 2.82532V3.82532H6.16863L6.46152 3.53242L5.75442 2.82532ZM2.66011 5.91962L3.36722 6.62673L3.66011 6.33383V5.91962H2.66011ZM1.53309 7.04664L0.825983 6.33954H0.825982L1.53309 7.04664ZM1.53309 9.16797L2.2402 8.46086L2.2402 8.46086L1.53309 9.16797ZM2.66011 10.295H3.66011V9.88078L3.36722 9.58788L2.66011 10.295ZM5.75438 13.3893L6.46149 12.6822L6.1686 12.3893H5.75438V13.3893ZM10.1301 13.3893V12.3893H9.71593L9.42304 12.6822L10.1301 13.3893ZM13.2241 10.2953L12.517 9.58824L12.2241 9.88113V10.2953H13.2241ZM14.3514 9.16796L13.6443 8.46086V8.46086L14.3514 9.16796ZM13.2241 5.91926H12.2241V6.33347L12.517 6.62637L13.2241 5.91926ZM10.1301 2.82532L9.42301 3.53242L9.7159 3.82532H10.1301V2.82532ZM7.58871 2.40524C7.78397 2.20997 8.10056 2.20997 8.29582 2.40523L9.71003 0.991021C8.73372 0.0147097 7.15081 0.0147132 6.1745 0.991023L7.58871 2.40524ZM6.46152 3.53242L7.58871 2.40524L6.1745 0.991023L5.04731 2.11821L6.46152 3.53242ZM4.16011 3.82532H5.75442V1.82532H4.16011V3.82532ZM3.66011 4.32532C3.66011 4.04917 3.88397 3.82532 4.16011 3.82532V1.82532C2.7794 1.82532 1.66011 2.94461 1.66011 4.32532H3.66011ZM3.66011 5.91962V4.32532H1.66011V5.91962H3.66011ZM2.2402 7.75375L3.36722 6.62673L1.95301 5.21251L0.825983 6.33954L2.2402 7.75375ZM2.2402 8.46086C2.04493 8.2656 2.04493 7.94901 2.2402 7.75375L0.825982 6.33954C-0.150329 7.31585 -0.150326 8.89876 0.825984 9.87507L2.2402 8.46086ZM3.36722 9.58788L2.2402 8.46086L0.825983 9.87507L1.95301 11.0021L3.36722 9.58788ZM3.66011 11.8893V10.295H1.66011V11.8893H3.66011ZM4.16012 12.3893C3.88397 12.3893 3.66011 12.1654 3.66011 11.8893H1.66011C1.66011 13.27 2.77941 14.3893 4.16012 14.3893V12.3893ZM5.75438 12.3893H4.16012V14.3893H5.75438V12.3893ZM7.58871 13.8094L6.46149 12.6822L5.04728 14.0964L6.1745 15.2236L7.58871 13.8094ZM8.29582 13.8094C8.10056 14.0046 7.78397 14.0046 7.58871 13.8094L6.1745 15.2236C7.15081 16.1999 8.73372 16.1999 9.71003 15.2236L8.29582 13.8094ZM9.42304 12.6822L8.29582 13.8094L9.71003 15.2236L10.8373 14.0964L9.42304 12.6822ZM11.7241 12.3893H10.1301V14.3893H11.7241V12.3893ZM12.2241 11.8893C12.2241 12.1654 12.0002 12.3893 11.7241 12.3893V14.3893C13.1048 14.3893 14.2241 13.27 14.2241 11.8893H12.2241ZM12.2241 10.2953V11.8893H14.2241V10.2953H12.2241ZM13.6443 8.46086L12.517 9.58824L13.9312 11.0025L15.0585 9.87507L13.6443 8.46086ZM13.6443 7.75375C13.8396 7.94901 13.8396 8.2656 13.6443 8.46086L15.0585 9.87507C16.0349 8.89876 16.0349 7.31585 15.0585 6.33954L13.6443 7.75375ZM12.517 6.62637L13.6443 7.75375L15.0585 6.33954L13.9312 5.21215L12.517 6.62637ZM12.2241 4.32532V5.91926H14.2241V4.32532H12.2241ZM11.7241 3.82532C12.0002 3.82532 12.2241 4.04917 12.2241 4.32532H14.2241C14.2241 2.9446 13.1048 1.82532 11.7241 1.82532V3.82532ZM10.1301 3.82532H11.7241V1.82532H10.1301V3.82532ZM8.29582 2.40524L9.42301 3.53242L10.8372 2.11821L9.71003 0.991021L8.29582 2.40524Z"
+    fill="url(#paint1_linear_13984_18011)" mask="url(#path-2-outside-1_13984_18011)" />
+  <path d="M5.27734 8.74515L6.63549 10.1938L10.8669 6.24" stroke="#FCFCFC" stroke-width="1.5"
+    stroke-linecap="round" stroke-linejoin="round" />
+  <defs>
+    <linearGradient id="paint0_linear_13984_18011" x1="7.94227" y1="1.25879" x2="7.94227"
+      y2="14.9558" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF2D55" />
+      <stop offset="1" stop-color="#C640CD" />
+    </linearGradient>
+    <linearGradient id="paint1_linear_13984_18011" x1="7.94227" y1="1.25879" x2="7.94227"
+      y2="14.9558" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FF2D55" />
+      <stop offset="1" stop-color="#C640CD" />
+    </linearGradient>
+  </defs>
+</svg>
+  
\ No newline at end of file
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/warning.svg b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/warning.svg
new file mode 100644
index 00000000..1e1dec42
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/images/warning.svg
@@ -0,0 +1,28 @@
+<svg width="82" height="70" viewBox="0 0 82 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M40.7646 14.7L68.5067 62.6316H13.0225L40.7646 14.7ZM40.7646 0L0.238281 70H81.2909L40.7646 0Z"
+    fill="url(#paint0_linear_13996_671)" />
+  <path d="M44.4488 51.5789H37.0804V58.9474H44.4488V51.5789Z" fill="url(#paint1_linear_13996_671)" />
+  <path d="M44.4488 29.4737H37.0804V47.8947H44.4488V29.4737Z" fill="url(#paint2_linear_13996_671)" />
+  <defs>
+    <linearGradient id="paint0_linear_13996_671" x1="0.238279" y1="-7.82149e-05" x2="91.446"
+      y2="52.2851" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFBC5B" />
+      <stop offset="0.505208" stop-color="#FF2D55" />
+      <stop offset="1" stop-color="#C640CD" />
+    </linearGradient>
+    <linearGradient id="paint1_linear_13996_671" x1="0.238279" y1="-7.82149e-05" x2="91.446"
+      y2="52.2851" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFBC5B" />
+      <stop offset="0.505208" stop-color="#FF2D55" />
+      <stop offset="1" stop-color="#C640CD" />
+    </linearGradient>
+    <linearGradient id="paint2_linear_13996_671" x1="0.238279" y1="-7.82149e-05" x2="91.446"
+      y2="52.2851" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFBC5B" />
+      <stop offset="0.505208" stop-color="#FF2D55" />
+      <stop offset="1" stop-color="#C640CD" />
+    </linearGradient>
+  </defs>
+</svg>
+  
\ No newline at end of file
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/index.ts b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/index.ts
new file mode 100644
index 00000000..7d6651e1
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/index.ts
@@ -0,0 +1 @@
+export { Deploy } from './component';
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/styles.css b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/styles.css
new file mode 100644
index 00000000..84fcb8cd
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/styles.css
@@ -0,0 +1,283 @@
+.Deploy {
+  position: relative;
+  min-height: 300px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: stretch;
+  gap: 24px;
+}
+
+.Deploy > .Loader {
+  top: -40px;
+  position: relative;
+}
+
+.Deploy .ethereum {
+  display: flex;
+  gap: 8px;
+}
+
+.Deploy .chip {
+  min-height: 24px;
+  border-radius: 16px;
+  padding: 4px 10px;
+  font-size: 13px;
+  line-height: 18px;
+  background-color: rgba(255, 255, 255, 0.08);
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.Deploy .chip.network {
+  background-color: #1f87e5;
+  text-transform: uppercase;
+}
+
+.Deploy .chip.username .verified {
+  display: inline-flex;
+  width: 16px;
+  height: 16px;
+  background: center no-repeat url(images/verified.svg);
+}
+
+.Deploy .chip.parcel .pin {
+  display: inline-flex;
+  width: 16px;
+  height: 16px;
+  background: center no-repeat url(images/pin.svg);
+}
+
+.Deploy .scene {
+  display: flex;
+  gap: 32px;
+}
+
+.Deploy .scene .info {
+  flex: 0 0 auto;
+  width: 256px;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.Deploy .scene .info .thumbnail {
+  width: 100%;
+  height: 160px;
+  background-position: center;
+  background-size: cover;
+  background-repeat: no-repeat;
+  border-radius: 8px;
+}
+
+.Deploy .scene .info .text {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.Deploy .scene .files {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  justify-content: stretch;
+  flex: 1 1 auto;
+}
+
+.Deploy .scene .files .filters {
+  display: flex;
+  flex: 0 0 auto;
+  justify-content: space-between;
+  color: #a09ba8;
+  background-color: rgba(255, 255, 255, 0.05);
+  height: 48px;
+  align-items: center;
+  padding: 0px 16px;
+  border-radius: 48px;
+}
+
+.Deploy .scene .files .filters .count {
+  flex: none;
+  text-transform: uppercase;
+}
+
+.Deploy .scene .files .filters .size {
+  flex: none;
+}
+
+.Deploy .scene .files .list {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
+  max-height: 400px;
+}
+
+.Deploy .scene .files .list .file {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.12);
+  padding: 6px 16px;
+  color: #a09ba8;
+}
+
+.Deploy .scene .files .list .file:last-child {
+  border-bottom: none;
+}
+
+.Deploy .scene .files .actions {
+  flex: 0 0 auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.Deploy .scene .files .Button .deploy-icon {
+  width: 24px;
+  height: 24px;
+  background: center no-repeat url(images/deploy.svg);
+  margin-left: 8px;
+}
+
+.Deploy .scene .files .Button .Loader {
+  margin-left: 12px;
+}
+
+.Deploy .scene .Button {
+  font-size: 15px;
+  padding: 8px 22px;
+  max-height: 40px;
+  flex: none;
+}
+
+.Deploy .scene .files .error {
+  color: var(--error);
+}
+
+.Deploy .cli-publish-error {
+  color: var(--dcl-silver);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  gap: 32px;
+}
+
+.Deploy .Warning {
+  width: 81px;
+  height: 70px;
+  background: center no-repeat url(images/warning.svg);
+}
+
+.Deploy .scene .success {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+  padding-left: 32px;
+  border-left: 1px solid var(--dark-gray);
+}
+
+.Deploy .scene .success .content {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: center;
+  gap: 16px;
+  min-height: 380px;
+  padding-bottom: 80px;
+}
+
+.Deploy .scene .success .content .success-icon {
+  width: 80px;
+  height: 80px;
+  background: center no-repeat url(images/success.svg);
+}
+
+.Deploy .scene .success .content .message {
+  color: var(--dcl-silver);
+  font-size: 20px;
+  font-weight: 500;
+  text-transform: uppercase;
+}
+
+.Deploy .scene .success .content .url {
+  color: var(--light-gray);
+  border: 1px solid var(--dark-gray);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 24px;
+  letter-spacing: 0.46px;
+  padding: 4px 10px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+}
+
+.Deploy .scene .success .content .jump-in-url label {
+  color: var(--dcl-silver);
+  line-height: 24px;
+  font-size: 14px;
+  letter-spacing: 0.17px;
+  font-weight: 500;
+  margin-bottom: 2px;
+  display: block;
+}
+
+.Deploy .scene .success .content .jump-in-url .copy-icon {
+  width: 18px;
+  height: 18px;
+  background: center no-repeat url(images/copy.svg);
+  margin-left: 8px;
+  display: inline-block;
+  cursor: pointer;
+}
+
+.Deploy .scene .success .actions {
+  flex: none;
+  display: flex;
+  justify-content: flex-end;
+}
+
+.Deploy .scene .success .Button .jump-in-icon {
+  width: 24px;
+  height: 24px;
+  background: center no-repeat url(images/jump-in.svg);
+  margin-left: 8px;
+}
+
+.Deploy .publish-warning {
+  position: absolute;
+  width: 600px;
+  background-color: var(--black);
+  padding: 32px 32px;
+  border-radius: 8px;
+  display: flex;
+  align-items: stretch;
+  justify-content: center;
+  flex-direction: column;
+  gap: 16px;
+  top: 40px;
+  left: calc(50% - 300px);
+}
+
+.Deploy .publish-warning .content {
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+  flex-direction: column;
+  gap: 16px;
+  color: var(--dcl-silver);
+}
+
+.Deploy .publish-warning .actions {
+  display: flex;
+  justify-content: space-between;
+}
+
+.Deploy .publish-warning .dont-show-again {
+  display: flex;
+  align-items: center;
+}
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/types.ts b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/types.ts
new file mode 100644
index 00000000..ec6eb7b7
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Deploy/types.ts
@@ -0,0 +1,16 @@
+export type File = {
+  name: string;
+  size: number;
+};
+
+export type Info = {
+  baseParcel: string;
+  debug: boolean;
+  description: string;
+  isPortableExperience: boolean;
+  isWorld: boolean;
+  parcels: string[];
+  rootCID: string;
+  skipValidations: boolean;
+  title: string;
+};
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Initial/component.tsx b/packages/renderer/src/components/Modals/PublishProject/steps/Initial/component.tsx
new file mode 100644
index 00000000..791fe37b
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Initial/component.tsx
@@ -0,0 +1,70 @@
+import { OptionBox } from '/@/components/EditorPage/OptionBox';
+import { t } from '/@/modules/store/translation/utils';
+import LandPng from '/assets/images/land.png';
+import WorldsPng from '/assets/images/worlds.png';
+import type { Props } from '../../types';
+
+import './styles.css';
+import { useAuth } from '/@/hooks/useAuth';
+import { Button } from 'decentraland-ui2';
+import { PublishModal } from '../../PublishModal';
+
+export function Initial(props: Props) {
+  const { isSignedIn, signIn } = useAuth();
+  const { onBack: _, ...rest } = props;
+  if (!isSignedIn) {
+    return (
+      <PublishModal
+        title={t('home.cards.sign_in.action')}
+        subtitle={t('home.cards.sign_in.title')}
+        size="tiny"
+        {...rest}
+      >
+        <div className="Initial">
+          <Button
+            color="primary"
+            variant="contained"
+            onClick={signIn}
+          >
+            {t('home.cards.sign_in.action')}
+          </Button>
+        </div>
+      </PublishModal>
+    );
+  } else {
+    return (
+      <PublishModal
+        title={t('modal.publish_project.title', { title: props.project.title })}
+        subtitle={t('modal.publish_project.select')}
+        {...rest}
+      >
+        <div className="Initial">
+          <div className="options">
+            <OptionBox
+              thumbnailSrc={WorldsPng}
+              title={t('modal.publish_project.worlds.title')}
+              description={t('modal.publish_project.worlds.description')}
+              buttonText={t('modal.publish_project.worlds.action')}
+              onClickPublish={() => props.onStep('publish-to-world')}
+              learnMoreUrl="https://docs.decentraland.org/creator/worlds/about/#publish-a-world"
+            />
+            <OptionBox
+              thumbnailSrc={LandPng}
+              title={t('modal.publish_project.land.title')}
+              description={t('modal.publish_project.land.description')}
+              buttonText={t('modal.publish_project.land.action')}
+              onClickPublish={() => props.onStep('publish-to-land')}
+              learnMoreUrl="https://docs.decentraland.org/creator/development-guide/sdk7/publishing-permissions/#land-permission-options"
+            />
+          </div>
+          <span
+            className="alternative_servers"
+            onClick={() => props.onStep('alternative-servers')}
+          >
+            {t('modal.publish_project.alternative_servers.title')}
+          </span>
+        </div>
+      </PublishModal>
+    );
+  }
+}
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Initial/index.ts b/packages/renderer/src/components/Modals/PublishProject/steps/Initial/index.ts
new file mode 100644
index 00000000..58143fdf
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Initial/index.ts
@@ -0,0 +1 @@
+export { Initial } from './component';
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/Initial/styles.css b/packages/renderer/src/components/Modals/PublishProject/steps/Initial/styles.css
new file mode 100644
index 00000000..534925a4
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/Initial/styles.css
@@ -0,0 +1,27 @@
+/* TODO: update the Modal component in ui2 to allow providing a className to the Material Modal...*/
+
+/* Initial Modal */
+.MuiModal-root .Initial {
+  display: flex;
+  flex-direction: column;
+}
+
+.MuiModal-root .Initial .select,
+.MuiModal-root .Initial .alternative_servers {
+  text-align: center;
+}
+
+.MuiModal-root .Initial .options {
+  display: flex;
+  margin: 20px 0;
+}
+
+.MuiModal-root .Initial .options .OptionBox + .OptionBox {
+  margin-left: 20px;
+}
+
+.MuiModal-root .Initial .alternative_servers {
+  text-decoration: underline;
+  text-transform: uppercase;
+  cursor: pointer;
+}
diff --git a/packages/renderer/src/components/Modals/PublishProject/steps/PublishToLand/component.tsx b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToLand/component.tsx
new file mode 100644
index 00000000..65501ba3
--- /dev/null
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToLand/component.tsx
@@ -0,0 +1,243 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Box, Button, styled, Typography } from 'decentraland-ui2';
+import { Atlas } from 'decentraland-ui2/dist/components/Atlas/Atlas';
+import type { SceneParcels } from '@dcl/schemas';
+
+import { useSelector } from '#store';
+
+import { DEPLOY_URLS } from '/shared/types/deploy';
+import type { Project } from '/shared/types/projects';
+
+import { t } from '/@/modules/store/translation/utils';
+import { selectors as landSelectors } from '/@/modules/store/land';
+import { useEditor } from '/@/hooks/useEditor';
+import { useWorkspace } from '/@/hooks/useWorkspace';
+
+import { COLORS, type Coordinate } from './types';
+import { type Props } from '../../types';
+import { PublishModal } from '../../PublishModal';
+
+function parseCoords(coords: string) {
+  return coords.split(',').map(coord => parseInt(coord, 10)) as [number, number];
+}
+function calculateParcels(project: Project, point: Coordinate): Coordinate[] {
+  const [baseX, baseY] = parseCoords(project.scene.base);
+  return project.scene.parcels.map(parcel => {
+    const [x, y] = parseCoords(parcel);
+    return { x: x - baseX + point.x, y: y - baseY + point.y };
+  });
+}
+
+const PublishToLandModal = styled(PublishModal)({
+  '& > .MuiPaper-root > .MuiBox-root:last-child': {
+    padding: 0,
+  },
+});
+
+export function PublishToLand(props: Props) {
+  const { project, publishScene } = useEditor();
+  const { updateProject, updateSceneJson } = useWorkspace();
+  const tiles = useSelector(state => state.land.tiles);
+  const landTiles = useSelector(state => landSelectors.getLandTiles(state.land));
+  const [hover, setHover] = useState<Coordinate>({ x: 0, y: 0 });
+  const [placement, setPlacement] = useState<Coordinate | null>(null);
+  const [initialPlacement, setInitialPlacement] = useState<Coordinate | null>(null);
+  const [didAutoPlace, setDidAutoPlace] = useState(false);
+
+  if (!project) return null;
+
+  // Memoize the project parcels centered around the hover position
+  const projectParcels = useMemo(() => calculateParcels(project, hover), [project, hover]);
+
+  const handleNext = useCallback(async () => {
+    if (!placement) return;
+    const sceneUpdates: SceneParcels = {
+      base: `${placement.x},${placement.y}`,
+      parcels: calculateParcels(project, placement).map(({ x, y }) => `${x},${y}`),
+    };
+    await updateSceneJson(project.path, { scene: sceneUpdates, worldConfiguration: undefined });
+    updateProject({
+      ...project,
+      scene: sceneUpdates,
+      worldConfiguration: undefined, // Cannot deploy to a LAND with a world configuration
+      updatedAt: Date.now(),
+    });
+    void publishScene({
+      target: import.meta.env.VITE_CATALYST_SERVER || DEPLOY_URLS.CATALYST_SERVER,
+    });
+    props.onStep('deploy');
+  }, [placement, props.onStep]);
+
+  const handleHover = useCallback((x: number, y: number) => {
+    setHover({ x, y });
+  }, []);
+
+  const isHighlighted = useCallback(
+    (x: number, y: number) =>
+      !placement && projectParcels.some(parcel => parcel.x === x && parcel.y === y),
+    [placement, projectParcels],
+  );
+
+  const isPlaced = useCallback(
+    (x: number, y: number) => {
+      if (!placement) return false;
+      const placedParcels = calculateParcels(project, placement);
+      return placedParcels.some(parcel => parcel.x === x && parcel.y === y);
+    },
+    [project, placement],
+  );
+
+  const isValid = useMemo(() => {
+    return hover && projectParcels.every(({ x, y }) => !!landTiles[`${x},${y}`]);
+  }, [landTiles, hover, projectParcels]);
+
+  const strokeLayer = useCallback(
+    (x: number, y: number) => {
+      const placed = isPlaced(x, y);
+      if (isHighlighted(x, y) || placed) {
+        return {
+          color: isValid || placed ? COLORS.selectedStroke : COLORS.indicatorStroke,
+          scale: 1.5,
+        };
+      }
+      return null;
+    },
+    [isHighlighted, isValid, isPlaced],
+  );
+
+  const highlightLayer = useCallback(
+    (x: number, y: number) => {
+      const placed = isPlaced(x, y);
+      if (isHighlighted(x, y) || placed) {
+        return { color: isValid || placed ? COLORS.selected : COLORS.indicator, scale: 1.2 };
+      }
+      return null;
+    },
+    [isHighlighted, isValid, isPlaced],
+  );
+
+  const ownedLayer = useCallback(
+    (x: number, y: number) => {
+      const key = `${x},${y}`;
+      return landTiles[key] && landTiles[key].land.owner === tiles[key].owner
+        ? { color: COLORS.freeParcel }
+        : null;
+    },
+    [tiles, landTiles],
+  );
+
+  const handlePlacement = useCallback(
+    (x: number, y: number) => {
+      if (!isValid) return;
+      setPlacement({ x, y });
+    },
+    [project, isValid],
+  );
+
+  const handleClearPlacement = useCallback(() => {
+    setPlacement(null);
+  }, []);
+
+  // set initial placement
+  useEffect(() => {
+    if (!initialPlacement) {
+      const { base, parcels } = project.scene;
+      // use the base parcel if it's a valid coord
+      if (base in landTiles && parcels.every(parcel => parcel in landTiles)) {
+        const [x, y] = parseCoords(base);
+        setInitialPlacement({ x, y });
+      } else {
+        // if the base parcel in the scene.json is not valid (ie. it is 0,0) then select the first coord of the available tiles as the initial placement
+        const available = Object.keys(landTiles);
+        if (available.length > 0) {
+          const [x, y] = parseCoords(available[0]);
+          setInitialPlacement({ x, y });
+        }
+      }
+    }
+  }, [initialPlacement, setInitialPlacement, project, landTiles]);
+
+  // use initial placement if possible
+  useEffect(() => {
+    if (didAutoPlace) return;
+    if (!placement && initialPlacement) {
+      const initialPlacementParcels = calculateParcels(project, initialPlacement);
+      if (initialPlacementParcels.every(({ x, y }) => !!landTiles[`${x},${y}`])) {
+        setPlacement(initialPlacement);
+        setDidAutoPlace(true);
+      }
+    }
+  }, [placement, setPlacement, initialPlacement, didAutoPlace, setDidAutoPlace, landTiles]);
+
+  return (
+    <PublishToLandModal
+      title={t('modal.publish_project.land.action')}
+      size="large"
+      {...props}
+    >
+      <Box>
+        <Box
+          height={480}
+          style={{ backgroundColor: 'black' }}
+        >
+          {/* @ts-expect-error TODO: Update properties in UI2, making the not required `optional` */}
+          <Atlas
+            tiles={tiles}
+            layers={[strokeLayer, highlightLayer, ownedLayer]}
+            onHover={handleHover}
+            onClick={handlePlacement}
+            withZoomControls
+            x={initialPlacement?.x as number}
+            y={initialPlacement?.y as number}
+          />
+        </Box>
+        <Box
+          padding={2}
+          paddingBottom={1}
+          display="flex"
+          justifyContent="space-between"
+          alignItems="center"
+        >
+          <Box
+            flex={1}
+            display="flex"
+            padding={1}
+            mr={2}
+            sx={{ border: '1px solid grey', borderRadius: '8px' }}
+            justifyContent="center"
+            alignItems="baseline"
+            height={45}
+          >
+            <Typography variant="body1">
+              {placement
+                ? t('modal.publish_project.land.select_parcel.place_scene', {
+                    coords: `${placement.x},${placement.y}`,
+                  })
+                : t('modal.publish_project.land.select_parcel.select_parcel')}
+            </Typography>
+            {placement && (
+              <Button
+                variant="text"
+                size="small"
+                onClick={handleClearPlacement}
+                sx={{ marginLeft: 1, padding: 0 }}
+              >
+                {t('modal.publish_project.land.select_parcel.actions.reset')}
+              </Button>
+            )}
+          </Box>
+          <Button
+            variant="contained"
+            color="primary"
+            size="large"
+            onClick={handleNext}
+            disabled={!placement}
+            sx={{ height: '45px' }}
+          >
+            {t('modal.publish_project.land.select_parcel.actions.publish')}
+          </Button>
+        </Box>
+      </Box>
+    </PublishToLandModal>
+  );
+}
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishToLand/index.ts b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToLand/index.ts
similarity index 100%
rename from packages/renderer/src/components/Modals/PublishProject/PublishToLand/index.ts
rename to packages/renderer/src/components/Modals/PublishProject/steps/PublishToLand/index.ts
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishToLand/types.ts b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToLand/types.ts
similarity index 100%
rename from packages/renderer/src/components/Modals/PublishProject/PublishToLand/types.ts
rename to packages/renderer/src/components/Modals/PublishProject/steps/PublishToLand/types.ts
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishToWorld/component.tsx b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/component.tsx
similarity index 83%
rename from packages/renderer/src/components/Modals/PublishProject/PublishToWorld/component.tsx
rename to packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/component.tsx
index 03cd343c..29ad2678 100644
--- a/packages/renderer/src/components/Modals/PublishProject/PublishToWorld/component.tsx
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/component.tsx
@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { ChainId } from '@dcl/schemas/dist/dapps/chain-id';
 import {
   Checkbox,
   CircularProgress as Loader,
@@ -23,7 +22,6 @@ import { t } from '/@/modules/store/translation/utils';
 import { addBase64ImagePrefix } from '/@/modules/image';
 import { ENSProvider } from '/@/modules/store/ens/types';
 import { getEnsProvider } from '/@/modules/store/ens/utils';
-import { useAuth } from '/@/hooks/useAuth';
 import { useEditor } from '/@/hooks/useEditor';
 import { useWorkspace } from '/@/hooks/useWorkspace';
 
@@ -31,32 +29,41 @@ import EmptyWorldSVG from '/assets/images/empty-deploy-to-world.svg';
 import LogoDCLSVG from '/assets/images/logo-dcl.svg';
 import LogoENSSVG from '/assets/images/logo-ens.svg';
 
-import { Button } from '../../../Button';
+import { PublishModal } from '../../PublishModal';
+import { Button } from '../../../../Button';
+import { type Props } from '../../types';
 
 import './styles.css';
 
-export function PublishToWorld({ onClose }: { onClose: () => void }) {
+export function PublishToWorld(props: Props) {
   const { project, publishScene } = useEditor();
   const names = useSelector(state => state.ens.data);
   const emptyNames = Object.keys(names).length === 0;
 
-  const handleClickPublish = useCallback(() => {
+  const handleNext = useCallback(() => {
     publishScene({ targetContent: import.meta.env.VITE_WORLDS_SERVER || DEPLOY_URLS.WORLDS });
-    onClose();
-  }, []);
+    props.onStep('deploy');
+  }, [props.onStep, publishScene]);
 
-  return emptyNames ? (
-    <EmptyNames />
-  ) : (
-    <SelectWorld
-      project={project!}
-      onPublish={handleClickPublish}
-    />
+  return (
+    <PublishModal
+      title={t('modal.publish_project.worlds.select_world.title')}
+      subtitle={t('modal.publish_project.worlds.select_world.description')}
+      {...props}
+    >
+      {!emptyNames ? (
+        <SelectWorld
+          project={project!}
+          onPublish={handleNext}
+        />
+      ) : (
+        <EmptyNames />
+      )}
+    </PublishModal>
   );
 }
 
 function SelectWorld({ project, onPublish }: { project: Project; onPublish: () => void }) {
-  const { chainId } = useAuth();
   const { updateSceneJson, updateProject } = useWorkspace();
   const names = useSelector(state => state.ens.data);
   const [name, setName] = useState(project.worldConfiguration?.name || '');
@@ -79,13 +86,6 @@ function SelectWorld({ project, onPublish }: { project: Project; onPublish: () =
     return _names;
   }, [names, ensProvider]);
 
-  const getExplorerUrl = useMemo(() => {
-    if (chainId === ChainId.ETHEREUM_SEPOLIA) {
-      return `decentraland://?realm=${DEPLOY_URLS.DEV_WORLDS}/world/${name}&NETWORK=sepolia`;
-    }
-    return `decentraland://?realm=${name}`;
-  }, [name]);
-
   const handleClick = useCallback(() => {
     onPublish();
   }, [project, name]);
@@ -137,21 +137,6 @@ function SelectWorld({ project, onPublish }: { project: Project; onPublish: () =
 
   return (
     <div className="SelectWorld">
-      <div>
-        <Typography
-          variant="h5"
-          textAlign="center"
-          mb="8px"
-        >
-          {t('modal.publish_project.worlds.select_world.title')}
-        </Typography>
-        <Typography
-          variant="body2"
-          textAlign="center"
-        >
-          {t('modal.publish_project.worlds.select_world.description')}
-        </Typography>
-      </div>
       <div className="box">
         <div className="thumbnail">
           {!projectIsReady ? <Loader /> : <img src={addBase64ImagePrefix(project.thumbnail)} />}
@@ -221,22 +206,6 @@ function SelectWorld({ project, onPublish }: { project: Project; onPublish: () =
               </MenuItem>
             </Select>
           </FormControl>
-          {!!name && (
-            <Typography variant="caption">
-              {t('modal.publish_project.worlds.select_world.world_url_description', {
-                b: (child: JSX.Element) => <b>{child}</b>,
-                br: () => <br />,
-                world_url: (
-                  <a
-                    href={getExplorerUrl}
-                    onClick={() => misc.openExternal(getExplorerUrl)}
-                  >
-                    {getExplorerUrl}
-                  </a>
-                ),
-              })}
-            </Typography>
-          )}
           {hasWorldContent && (
             <div className="WorldHasContent">
               <div className="WarningIcon">
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishToWorld/index.ts b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/index.ts
similarity index 100%
rename from packages/renderer/src/components/Modals/PublishProject/PublishToWorld/index.ts
rename to packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/index.ts
diff --git a/packages/renderer/src/components/Modals/PublishProject/PublishToWorld/styles.css b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/styles.css
similarity index 98%
rename from packages/renderer/src/components/Modals/PublishProject/PublishToWorld/styles.css
rename to packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/styles.css
index df36afe0..50869598 100644
--- a/packages/renderer/src/components/Modals/PublishProject/PublishToWorld/styles.css
+++ b/packages/renderer/src/components/Modals/PublishProject/steps/PublishToWorld/styles.css
@@ -24,6 +24,7 @@
 .MuiModal-root .SelectWorld .thumbnail img {
   width: 100%;
   object-fit: cover;
+  border-radius: 8px;
 }
 
 .MuiModal-root .SelectWorld .box .selection {
diff --git a/packages/renderer/src/components/Modals/PublishProject/types.ts b/packages/renderer/src/components/Modals/PublishProject/types.ts
index f007062a..b78a0659 100644
--- a/packages/renderer/src/components/Modals/PublishProject/types.ts
+++ b/packages/renderer/src/components/Modals/PublishProject/types.ts
@@ -4,13 +4,18 @@ export type Props = {
   open: boolean;
   project: Project;
   onClose: () => void;
-  onSubmit: (value: StepValue) => void;
+  onBack?: () => void;
+  onStep: (step: Step) => void;
 };
 
-export type Step = 'initial' | 'alternative-servers' | 'publish-to-world' | 'publish-to-land';
+export type Step =
+  | 'initial'
+  | 'alternative-servers'
+  | 'publish-to-world'
+  | 'publish-to-land'
+  | 'deploy';
+
 export type InitialTarget = 'worlds' | 'land';
 export type AlternativeTarget = 'test' | 'custom';
 
-export type Target = InitialTarget | AlternativeTarget;
-export type StepValue = { target: Target; value?: string };
-export type StepProps = { onClick: (value: StepValue) => void };
+export type TargetType = InitialTarget | AlternativeTarget;
diff --git a/packages/renderer/src/hooks/useIsMounted.ts b/packages/renderer/src/hooks/useIsMounted.ts
new file mode 100644
index 00000000..739300df
--- /dev/null
+++ b/packages/renderer/src/hooks/useIsMounted.ts
@@ -0,0 +1,14 @@
+import { useCallback, useEffect, useRef } from 'react';
+
+export function useIsMounted() {
+  const isMounted = useRef(false);
+
+  useEffect(() => {
+    isMounted.current = true;
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
+  return useCallback(() => isMounted.current, []);
+}
diff --git a/packages/renderer/src/hooks/useWorkspace.ts b/packages/renderer/src/hooks/useWorkspace.ts
index 485b8aa7..69734376 100644
--- a/packages/renderer/src/hooks/useWorkspace.ts
+++ b/packages/renderer/src/hooks/useWorkspace.ts
@@ -64,7 +64,7 @@ export const useWorkspace = () => {
   }, []);
 
   const updateSceneJson = useCallback((path: string, updates: Partial<Scene>) => {
-    dispatch(workspaceActions.updateSceneJson({ path, updates }));
+    return dispatch(workspaceActions.updateSceneJson({ path, updates }));
   }, []);
 
   const isLoading = workspace.status === 'loading';
diff --git a/packages/renderer/src/modules/store/editor/slice.ts b/packages/renderer/src/modules/store/editor/slice.ts
index 71a98e87..44264123 100644
--- a/packages/renderer/src/modules/store/editor/slice.ts
+++ b/packages/renderer/src/modules/store/editor/slice.ts
@@ -22,8 +22,9 @@ export type EditorState = {
   project?: Project;
   inspectorPort: number;
   publishPort: number;
-  loadingInspector: boolean;
   loadingPublish: boolean;
+  publishError: string | null;
+  loadingInspector: boolean;
   loadingPreview: boolean;
   isInstalling: boolean;
   isInstalled: boolean;
@@ -35,8 +36,9 @@ const initialState: EditorState = {
   version: null,
   inspectorPort: 0,
   publishPort: 0,
-  loadingInspector: false,
   loadingPublish: false,
+  publishError: null,
+  loadingInspector: false,
   loadingPreview: false,
   isInstalling: false,
   isInstalled: false,
@@ -84,13 +86,14 @@ export const slice = createSlice({
     builder.addCase(publishScene.pending, state => {
       state.publishPort = 0;
       state.loadingPublish = true;
+      state.publishError = null;
     });
     builder.addCase(publishScene.fulfilled, (state, action) => {
       state.publishPort = action.payload;
       state.loadingPublish = false;
     });
     builder.addCase(publishScene.rejected, (state, action) => {
-      state.error = action.error.message ? new Error(action.error.message) : null;
+      state.publishError = action.error.message || null;
       state.loadingPublish = false;
     });
     builder.addCase(workspaceActions.createProject.pending, state => {
diff --git a/packages/renderer/src/modules/store/translation/locales/en.json b/packages/renderer/src/modules/store/translation/locales/en.json
index 3d867ff0..268fd6fb 100644
--- a/packages/renderer/src/modules/store/translation/locales/en.json
+++ b/packages/renderer/src/modules/store/translation/locales/en.json
@@ -112,7 +112,6 @@
             "dcl": "NAME",
             "ens": "ENS Domain"
           },
-          "world_url_description": "The URL to jump in your World will be:<br></br><b>{world_url}</b>",
           "world_has_content": "The existing content in {world} World will be replaced with the new content you're about to publish.",
           "confirm_world_replace_content": "I understand that this action is irreversible"
         },
@@ -150,6 +149,30 @@
         "errors": {
           "url": "Invalid URL"
         }
+      },
+      "deploy": {
+        "warning": {
+          "message": "PLEASE READ CAREFULLY:<ul><li>After deployment, your scene will undergo processing before becoming available.</li><li>This process may take 15 minutes on average.</li><li>During this time, your scene will appear empty until it has been updated on the client.</li></ul>",
+          "checkbox": "Don't show again",
+          "continue": "Continue",
+          "back": "Go back"
+        },
+        "ethereum": {
+          "mainnet": "Mainnet",
+          "testnet": "Testnet"
+        },
+        "files": {
+          "count": "{count} {count, plural, one {file} other {files}}",
+          "size": "Total Size <b>{size}</b>",
+          "publish": "Publish"
+        },
+        "success": {
+          "message": "You scene is successfully published",
+          "url": "The URL to jump in your {target} is:",
+          "world": "World",
+          "land": "Land",
+          "jump_in": "Jump In"
+        }
       }
     },
     "app_settings": {
diff --git a/packages/renderer/src/modules/store/translation/locales/es.json b/packages/renderer/src/modules/store/translation/locales/es.json
index 737beeec..d97b50d0 100644
--- a/packages/renderer/src/modules/store/translation/locales/es.json
+++ b/packages/renderer/src/modules/store/translation/locales/es.json
@@ -111,7 +111,6 @@
             "dcl": "NOMBRE",
             "ens": "DOMINIO ENS"
           },
-          "world_url_description": "La URL para acceder a tu mundo será:<br></br><b>{world_url}</b>",
           "world_has_content": "El contenido existente en el mundo {world} será reemplazado por el nuevo contenido que estás a punto de publicar.",
           "confirm_world_replace_content": "Entiendo que esta acción es irreversible."
         },
@@ -148,6 +147,30 @@
         "errors": {
           "url": "URL inválida"
         }
+      },
+      "deploy": {
+        "warning": {
+          "message": "POR FAVOR LEA CUIDADOSAMENTE:<ul><li>Después de la implementación, tu escena pasará por un proceso antes de estar disponible.</li><li>Este proceso puede tardar en promedio 15 minutos.</li><li>Durante este tiempo, tu escena aparecerá vacía hasta que se haya actualizado en el cliente.</li></ul>",
+          "checkbox": "No mostrar de nuevo",
+          "continue": "Continuar",
+          "back": "Regresar"
+        },
+        "ethereum": {
+          "mainnet": "Mainnet",
+          "testnet": "Testnet"
+        },
+        "files": {
+          "count": "{count} {count, plural, one {archivo} other {archivos}}",
+          "size": "Tamaño Total <b>{size}</b>",
+          "publish": "Publicar"
+        },
+        "success": {
+          "message": "Tu escena se ha publicado con éxito",
+          "url": "La URL para acceder a tu {target} es:",
+          "world": "Mundo",
+          "land": "Tierra",
+          "jump_in": "Entrar"
+        }
       }
     },
     "app_settings": {
diff --git a/packages/renderer/src/modules/store/translation/locales/zh.json b/packages/renderer/src/modules/store/translation/locales/zh.json
index 5245cc41..fc3bcb80 100644
--- a/packages/renderer/src/modules/store/translation/locales/zh.json
+++ b/packages/renderer/src/modules/store/translation/locales/zh.json
@@ -111,7 +111,6 @@
             "dcl": "姓名",
             "ens": "ENS 域"
           },
-          "world_url_description": "在您的世界中跳躍的 URL 為：<br></br><b>{world_url}</b>",
           "world_has_content": "{world} World 中的現有內容將替換為您要發布的新內容。",
           "confirm_world_replace_content": "我了解此操作不可逆轉"
         },
@@ -148,6 +147,30 @@
         "errors": {
           "url": "无效的网址"
         }
+      },
+      "deploy": {
+        "warning": {
+          "message": "请仔细阅读：<ul><li>部署后，您的场景将进行处理，然后才能使用。</li><li>此过程平均可能需要15分钟。</li><li>在此期间，您的场景将显示为空，直到客户端更新。</li></ul>",
+          "checkbox": "不再显示",
+          "continue": "继续",
+          "back": "返回"
+        },
+        "ethereum": {
+          "mainnet": "主网",
+          "testnet": "测试网"
+        },
+        "files": {
+          "count": "{count} {count, plural, one {文件} other {文件}}",
+          "size": "总大小 <b>{size}</b>",
+          "publish": "发布"
+        },
+        "success": {
+          "message": "您的场景已成功发布",
+          "url": "跳转到您的 {target} 的URL是：",
+          "world": "世界",
+          "land": "土地",
+          "jump_in": "跳转"
+        }
       }
     },
     "app_settings": {
diff --git a/packages/renderer/src/themes/theme.css b/packages/renderer/src/themes/theme.css
index 94302ea4..96674bc3 100644
--- a/packages/renderer/src/themes/theme.css
+++ b/packages/renderer/src/themes/theme.css
@@ -96,3 +96,8 @@ a {
 .MuiDialog-paper {
   position: inherit !important;
 }
+
+/* Temp: make disabled buttons look disabled */
+.Button.MuiButton-root.Mui-disabled {
+  opacity: 0.5;
+}
diff --git a/packages/shared/types/ipc.ts b/packages/shared/types/ipc.ts
index ce56b8b7..9adde080 100644
--- a/packages/shared/types/ipc.ts
+++ b/packages/shared/types/ipc.ts
@@ -3,6 +3,14 @@ import { type OpenDialogOptions } from 'electron';
 import type { Outdated } from '/shared/types/npm';
 
 export type DeployOptions = { path: string; target?: string; targetContent?: string };
+export type IpcResult<T> = {
+  success: true;
+  value: T;
+};
+export type IpcError = {
+  success: false;
+  error: string;
+};
 
 export interface Ipc {
   'electron.getAppHome': () => string;
@@ -10,6 +18,7 @@ export interface Ipc {
   'electron.getWorkspaceConfigPath': (path: string) => Promise<string>;
   'electron.showOpenDialog': (opts: Partial<OpenDialogOptions>) => Promise<string[]>;
   'electron.openExternal': (url: string) => Promise<void>;
+  'electron.copyToClipboard': (text: string) => Promise<void>;
   'inspector.start': () => Promise<number>;
   'bin.install': () => Promise<void>;
   'bin.code': (path: string) => Promise<void>;
diff --git a/packages/shared/types/storage.ts b/packages/shared/types/storage.ts
index a8e866fe..b21bb775 100644
--- a/packages/shared/types/storage.ts
+++ b/packages/shared/types/storage.ts
@@ -5,7 +5,7 @@ type StorageData = {
   [key: string]: unknown;
 };
 
-type FileSystemStorage = Awaited<ReturnType<typeof _createFileSystemStorage>>;
+export type IFileSystemStorage = Awaited<ReturnType<typeof _createFileSystemStorage>>;
 
 async function _createFileSystemStorage(storagePath: string) {
   const dir = path.dirname(storagePath);
@@ -57,18 +57,18 @@ async function _createFileSystemStorage(storagePath: string) {
 }
 
 // In-memory Map of storages
-const storageMap = new Map<string, FileSystemStorage>();
+const storageMap = new Map<string, IFileSystemStorage>();
 
 export const FileSystemStorage = {
-  async create(path: string): Promise<FileSystemStorage> {
+  async create(path: string): Promise<IFileSystemStorage> {
     const storage = await _createFileSystemStorage(path);
     storageMap.set(path, storage);
     return storage;
   },
-  get(path: string): FileSystemStorage | undefined {
+  get(path: string): IFileSystemStorage | undefined {
     return storageMap.get(path);
   },
-  async getOrCreate(path: string): Promise<FileSystemStorage> {
+  async getOrCreate(path: string): Promise<IFileSystemStorage> {
     return storageMap.get(path) ?? (await this.create(path));
   },
 };
diff --git a/types/env.d.ts b/types/env.d.ts
index a9bd0fc9..48413b14 100644
--- a/types/env.d.ts
+++ b/types/env.d.ts
@@ -29,6 +29,7 @@ interface ImportMetaEnv {
   VITE_ASSET_PACKS_CONTENT_URL: string | undefined;
   VITE_ASSET_PACKS_JS_PORT: string | undefined;
   VITE_ASSET_PACKS_JS_PATH: string | undefined;
+  VITE_CLI_DEPLOY_PORT: string | undefined;
 
   // Publish
   VITE_WORLDS_SERVER: string | undefined;