diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index 61ffff243..4fd3697a3 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -18,7 +18,7 @@
     import { writable } from 'svelte/store';
     import { onMount } from 'svelte';
 
-    const backPage = `${base}/project-${$page.params.project}/sites/site-${$page.params.site}/domains`;
+    const routeBase = `${base}/project-${$page.params.project}/sites/site-${$page.params.site}/domains`;
 
     export let data;
 
@@ -60,8 +60,7 @@
                 await sdk.forProject.proxy.createSiteRule(domainName, $page.params.site);
             }
 
-            await goto(backPage);
-            await invalidate(Dependencies.DOMAINS);
+            await goto(`${routeBase}/add-domain/verify-${domainName}`);
             await invalidate(Dependencies.SITES_DOMAINS);
         } catch (error) {
             addNotification({
@@ -72,7 +71,7 @@
     }
 </script>
 
-<Wizard title="Add custom domain" href={backPage} column columnSize="s">
+<Wizard title="Add domain" href={routeBase} column columnSize="s" confirmExit>
     <Form bind:this={formComponent} onSubmit={addDomain} bind:isSubmitting>
         <Layout.Stack gap="xxl">
             <Fieldset legend="Domain">
@@ -188,7 +187,7 @@
     </Form>
 
     <svelte:fragment slot="footer">
-        <Button secondary href={backPage}>Cancel</Button>
+        <Button secondary href={routeBase}>Cancel</Button>
         <Button on:click={() => formComponent.triggerSubmit()} bind:disabled={$isSubmitting}>
             Add
         </Button>
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index 25e7ab654..ab3192fd5 100644
--- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -2,7 +2,7 @@
     import { IconGlobeAlt } from '@appwrite.io/pink-icons-svelte';
     import { Card, Icon, Layout, Typography } from '@appwrite.io/pink-svelte';
     import VerificationFieldset from './verificationFieldset.svelte';
-    import { Button } from '$lib/elements/forms';
+    import { Button, Form } from '$lib/elements/forms';
     import { sdk } from '$lib/stores/sdk';
     import { organization } from '$lib/stores/organization';
     import { addNotification } from '$lib/stores/notifications';
@@ -10,14 +10,19 @@
     import { Dependencies } from '$lib/constants';
     import { isCloud } from '$lib/system';
     import { page } from '$app/stores';
+    import Wizard from '$lib/layout/wizard.svelte';
+    import { base } from '$app/paths';
 
+    export let data;
     let selectedTab: 'cname' | 'nameserver';
+    let domainData = data.domain;
 
-    async function back() {}
+    let routeBase = `${base}/project-${$page.params.project}/sites/site-${$page.params.site}/domains`;
 
     async function addDomain() {
         const isNewDomain =
-            data.domains.rules.findIndex((rule) => rule.domain === $page.params.domain) === -1;
+            data.domainsList.domains.findIndex((rule) => rule.domain === $page.params.domain) ===
+            -1;
         try {
             if (isNewDomain && isCloud) {
                 domainData = await sdk.forConsole.domains.create(
@@ -30,7 +35,7 @@
                 type: 'success',
                 message: 'Domain added successfully'
             });
-            await goto(backPage);
+            await goto(routeBase);
             await invalidate(Dependencies.DOMAINS);
             await invalidate(Dependencies.SITES_DOMAINS);
         } catch (error) {
@@ -42,24 +47,38 @@
             });
         }
     }
+
+    async function back() {}
+
     $: isVerified = domainData?.nameservers
         ? domainData?.nameservers.toLocaleLowerCase() === 'appwrite'
         : undefined;
 </script>
 
-<Layout.Stack gap="xxl">
-    <Card.Base radius="s" padding="s">
-        <Layout.Stack direction="row" justifyContent="space-between" alignItems="center" gap="xs">
-            <Layout.Stack direction="row" alignItems="center" gap="xs">
-                <Icon icon={IconGlobeAlt} color="--fgcolor-neutral-primary" />
+<Wizard title="Add domain" href={routeBase} column columnSize="s">
+    <Form bind:this={formComponent} onSubmit={addDomain} bind:isSubmitting>
+        <Layout.Stack gap="xxl">
+            <Card.Base radius="s" padding="s">
+                <Layout.Stack
+                    direction="row"
+                    justifyContent="space-between"
+                    alignItems="center"
+                    gap="xs">
+                    <Layout.Stack direction="row" alignItems="center" gap="xs">
+                        <Icon icon={IconGlobeAlt} color="--fgcolor-neutral-primary" />
 
-                <Typography.Text variation="m-500" color="--fgcolor-neutral-primary">
-                    {$page.params.domain}
-                </Typography.Text>
-            </Layout.Stack>
-            <Button secondary on:click={back}>Change</Button>
+                        <Typography.Text variation="m-500" color="--fgcolor-neutral-primary">
+                            {$page.params.domain}
+                        </Typography.Text>
+                    </Layout.Stack>
+                    <Button secondary on:click={back}>Change</Button>
+                </Layout.Stack>
+            </Card.Base>
+
+            <VerificationFieldset
+                domain={$page.params.domain}
+                verified={isVerified}
+                bind:selectedTab />
         </Layout.Stack>
-    </Card.Base>
-
-    <VerificationFieldset domain={$page.params.domain} verified={isVerified} bind:selectedTab />
-</Layout.Stack>
+    </Form>
+</Wizard>