diff --git a/apps/console/app/routes/groups.enroll.$groupID.$invitationCode.tsx b/apps/console/app/routes/groups.enroll.$groupID.$invitationCode.tsx
index 57f4acd020..b35e2afd1b 100644
--- a/apps/console/app/routes/groups.enroll.$groupID.$invitationCode.tsx
+++ b/apps/console/app/routes/groups.enroll.$groupID.$invitationCode.tsx
@@ -159,7 +159,7 @@ export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
       identityGroupURN,
     })
 
-    return redirect(`/groups/${groupID}`)
+    return redirect(`/onboarding`)
   }
 )
 
diff --git a/apps/console/app/routes/onboarding.tsx b/apps/console/app/routes/onboarding.tsx
index e0a8194978..54b1906a83 100644
--- a/apps/console/app/routes/onboarding.tsx
+++ b/apps/console/app/routes/onboarding.tsx
@@ -24,6 +24,7 @@ import { HiOutlineBookOpen, HiOutlineLogout } from 'react-icons/hi'
 import { TbUserCog } from 'react-icons/tb'
 import useConnectResult from '@proofzero/design-system/src/hooks/useConnectResult'
 import { Toaster } from '@proofzero/design-system/src/atoms/toast'
+import { IdentityGroupURN } from '@proofzero/urns/identity-group'
 
 export const loader: LoaderFunction = getRollupReqFunctionErrorWrapper(
   async ({ request, context }) => {
@@ -53,11 +54,20 @@ export const loader: LoaderFunction = getRollupReqFunctionErrorWrapper(
     })
     const connectedEmails = getEmailDropdownItems(connectedAccounts)
 
+    const igs = await coreClient.identity.listIdentityGroups.query()
+    const targetIG =
+      igs[0] &&
+      igs[0].members.length > 1 &&
+      igs[0].members[0].URN !== identityURN
+        ? igs[0]
+        : undefined
+
     return json({
       url: request.url,
       profile,
       connectedEmails,
       PASSPORT_URL: context.env.PASSPORT_URL,
+      targetIG,
     })
   }
 )
@@ -77,14 +87,22 @@ export const shouldRevalidate = ({
 }
 
 export default function Onboarding() {
-  const { connectedEmails, PASSPORT_URL, profile, url } = useLoaderData<{
-    connectedEmails: DropdownSelectListItem[]
-    PASSPORT_URL: string
-    profile: Profile
-    url: string
-  }>()
+  const { connectedEmails, PASSPORT_URL, profile, url, targetIG } =
+    useLoaderData<{
+      connectedEmails: DropdownSelectListItem[]
+      PASSPORT_URL: string
+      profile: Profile
+      url: string
+      targetIG:
+        | {
+            name: string
+            URN: IdentityGroupURN
+          }
+        | undefined
+    }>()
 
-  const currentPage = new URL(url).searchParams.get('rollup_result') ? 1 : 0
+  const currentPage =
+    new URL(url).searchParams.get('rollup_result') || targetIG ? 1 : 0
 
   useConnectResult()
 
@@ -100,7 +118,9 @@ export default function Onboarding() {
             'basis-full 2xl:basis-2/5 flex items-start justify-center py-[2.5%] h-full'
           }
         >
-          <Outlet context={{ connectedEmails, PASSPORT_URL, currentPage }} />
+          <Outlet
+            context={{ connectedEmails, PASSPORT_URL, currentPage, targetIG }}
+          />
         </div>
         <div className="basis-3/5 h-[100dvh] w-full hidden lg:flex justify-end items-center bg-gray-50 dark:bg-gray-800 overflow-hidden">
           <img
diff --git a/apps/console/app/routes/onboarding/index.tsx b/apps/console/app/routes/onboarding/index.tsx
index 616b73bbfa..6861b6c82b 100644
--- a/apps/console/app/routes/onboarding/index.tsx
+++ b/apps/console/app/routes/onboarding/index.tsx
@@ -23,6 +23,7 @@ import { getAuthzHeaderConditionallyFromToken } from '@proofzero/utils'
 import { generateTraceContextHeaders } from '@proofzero/platform-middleware/trace'
 import { Spinner } from '@proofzero/design-system/src/atoms/spinner/Spinner'
 import type { AccountURN } from '@proofzero/urns/account'
+import { IdentityGroupURN } from '@proofzero/urns/identity-group'
 
 export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
   async ({ request, context }) => {
@@ -35,7 +36,7 @@ export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
       ...generateTraceContextHeaders(context.traceSpan),
     })
 
-    try {
+    const createApp = async (formData: FormData) => {
       const clientName = formData.get('clientName') as string
       const account = formData.get('account') as AccountURN
 
@@ -52,12 +53,60 @@ export const action: ActionFunction = getRollupReqFunctionErrorWrapper(
         clientId,
       })
 
-      return json({ clientId, success: true })
-    } catch (error) {
-      console.error({ error })
-      return new InternalServerError({
-        message: 'Could not create the application',
+      return {
+        clientId,
+        success: true,
+      }
+    }
+
+    const createGroup = async (formData: FormData) => {
+      const groupName = formData.get('groupName') as undefined | string
+
+      if (!groupName?.length) {
+        throw new BadRequestError({
+          message: 'Group name is required',
+        })
+      }
+
+      const { groupID } = await coreClient.identity.createIdentityGroup.mutate({
+        name: groupName,
       })
+
+      return {
+        groupID,
+        success: true,
+      }
+    }
+
+    switch (formData.get('op')) {
+      case 'createApp':
+        try {
+          const { clientId, success: createAppSuccess } = await createApp(
+            formData
+          )
+
+          return json({ clientId, success: createAppSuccess })
+        } catch (error) {
+          return new InternalServerError({
+            message: 'Could not create the application',
+          })
+        }
+      case 'createGroup':
+        try {
+          const { groupID, success: createGroupSuccess } = await createGroup(
+            formData
+          )
+
+          return json({ groupID, success: createGroupSuccess })
+        } catch (error) {
+          return new InternalServerError({
+            message: 'Could not create the group',
+          })
+        }
+      default:
+        throw new BadRequestError({
+          message: 'Invalid operation',
+        })
     }
   }
 )
@@ -82,8 +131,9 @@ const Option = ({
   return (
     <div
       className={`w-full flex p-4 flex-row items-center justify-start border rounded-lg gap-4
-    ${selected ? 'border-indigo-500' : ''} ${disabled ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'
-        }`}
+    ${selected ? 'border-indigo-500' : ''} ${
+        disabled ? 'opacity-50 cursor-not-allowed' : 'cursor-pointer'
+      }`}
       onClick={() => {
         if (disabled) return
         setSelectedType(type)
@@ -121,8 +171,9 @@ const SelectOrgType = ({
   return (
     <div
       className={`w-full h-full flex flex-col gap-2
-    transition-opacity ease-in-out delay-150 ${page === 0 ? 'opacity-100' : 'hide'
-        }`}
+    transition-opacity ease-in-out delay-150 ${
+      page === 0 ? 'opacity-100' : 'hide'
+    }`}
     >
       <Text size="lg" className="text-gray-400">
         1/4
@@ -138,17 +189,16 @@ const SelectOrgType = ({
         header="I'm solo developer"
         description="I'm setting up app for myself"
         selected={orgType === 'solo'}
-        setSelectedType={setOrgType}
+        setSelectedType={() => setOrgType('solo')}
         type="solo"
       />
       <Option
         Icon={TbUsers}
         header="I'm part of a team"
         description="I'm setting up app for a team"
-        disabled={true}
         selected={orgType === 'team'}
         type="team"
-        setSelectedType={setOrgType}
+        setSelectedType={() => setOrgType('team')}
       />
       <Button
         className="w-full"
@@ -198,8 +248,9 @@ const ConnectEmail = ({
   return (
     <div
       className={`w-full h-full flex flex-col gap-2
-       transition-opacity ease-in-out delay-150 ${page === 1 ? 'opacity-100' : 'hide'
-        }`}
+       transition-opacity ease-in-out delay-150 ${
+         page === 1 ? 'opacity-100' : 'hide'
+       }`}
     >
       <div className="flex flex-row items-center gap-2">
         <HiOutlineArrowLeft
@@ -221,7 +272,9 @@ const ConnectEmail = ({
           label="Full Name"
           id="name"
           className="w-full"
-          onChange={(ev) => setName(ev.target.value)}
+          onChange={(ev) => {
+            setName(ev.target.value)
+          }}
         />
       </div>
       {connectedEmails && connectedEmails.length === 0 && (
@@ -323,9 +376,11 @@ const ConnectEmail = ({
 }
 
 const CreateGroup = ({
+  setGroupID,
   setPage,
   page,
 }: {
+  setGroupID: (value: string) => void
   setPage: (value: number) => void
   page: number
 }) => {
@@ -333,6 +388,15 @@ const CreateGroup = ({
   const [groupSize, setGroupSize] = useState('2-10 members')
   const [groupRole, setGroupRole] = useState('Founder or leadership')
 
+  const fetcher = useFetcher()
+
+  useEffect(() => {
+    if (fetcher.state === 'idle' && fetcher.data?.groupID) {
+      setGroupID(fetcher.data?.groupID)
+      setPage(page + 1)
+    }
+  }, [fetcher.data, fetcher.state])
+
   return (
     <div
       className={`w-full h-full flex flex-col gap-2
@@ -425,13 +489,110 @@ const CreateGroup = ({
         btnType="primary-alt"
         btnSize="xl"
         disabled={
-          !groupName?.length || !groupSize?.length || !groupRole?.length
+          !groupName?.length ||
+          !groupSize?.length ||
+          !groupRole?.length ||
+          fetcher.state !== 'idle'
         }
+        onClick={() => {
+          fetcher.submit({ op: 'createGroup', groupName }, { method: 'post' })
+        }}
+      >
+        {fetcher.state === 'idle' ? <Text>Create Group</Text> : <Spinner />}
+      </Button>
+      <div className="mt-auto flex flex-row gap-2 w-full">
+        <div className="border w-full rounded-lg border-2 border-indigo-500" />
+        <div className="border w-full rounded-lg border-2 border-indigo-500" />
+        <div className="border w-full rounded-lg border-2 border-indigo-500" />
+        <div className="border w-full rounded-lg border-2" />
+      </div>
+    </div>
+  )
+}
+
+const EnrollToGroup = ({
+  groupName,
+  setPage,
+  page,
+}: {
+  groupName: string
+  setPage: (value: number) => void
+  page: number
+}) => {
+  const [groupRole, setGroupRole] = useState('Founder or leadership')
+
+  return (
+    <div
+      className={`w-full h-full flex flex-col gap-2
+      transition-opacity  ease-in-out delay-150
+      ${page === 2 ? 'opacity-100' : 'hide'}`}
+    >
+      <div className="flex flex-row items-center gap-2">
+        <HiOutlineArrowLeft
+          className="text-lg text-gray-400 cursor-pointer"
+          onClick={() => setPage(page - 1)}
+        />
+        <Text size="lg" className="text-gray-400">
+          3/4
+        </Text>
+      </div>
+      <Text size="2xl" weight="medium">
+        Workspace Details
+      </Text>
+      <Text size="lg" className="text-gray-400 mb-2">
+        Tell us more about your workspace so we can provide you a personalized
+        experience
+      </Text>
+
+      <Input
+        label="Group Name"
+        id="groupName"
+        className="w-full"
+        disabled={true}
+        readOnly={true}
+        value={groupName}
+        defaultValue={groupName}
+      />
+      <div className="w-full">
+        <Text size="sm" weight="medium" className="mb-0.5">
+          Your Role
+        </Text>
+
+        <Dropdown
+          items={[
+            { title: 'Founder or leadership', value: 'Founder or leadership' },
+            { title: 'Engineering manager', value: 'Product manager' },
+            { title: 'Software developer', value: 'Software developer' },
+            { title: 'Other', value: 'Other' },
+            { title: 'Prefer not to share', value: 'Prefer not to share' },
+          ]}
+          placeholder="Set your role"
+          defaultItems={[
+            { title: 'Founder or leadership', value: 'Founder or leadership' },
+          ]}
+          onSelect={(selected) => {
+            // type casting to DropdownSelectListItem instead of array
+            if (!Array.isArray(selected)) {
+              if (!selected || !selected.value) {
+                console.error('Error selecting email, try again')
+                return
+              }
+              setGroupRole(selected.value)
+            }
+          }}
+        />
+      </div>
+
+      <Button
+        className="w-full"
+        btnType="primary-alt"
+        btnSize="xl"
+        disabled={!groupName?.length || !groupRole?.length}
         onClick={() => {
           setPage(page + 1)
         }}
       >
-        Create Group
+        <Text>Continue</Text>
       </Button>
       <div className="mt-auto flex flex-row gap-2 w-full">
         <div className="border w-full rounded-lg border-2 border-indigo-500" />
@@ -557,7 +718,9 @@ const CongratsPage = ({
           <div className="flex flex-row gap-2 items-center">
             <Text>Configure your application</Text>
             <DocumentationBadge
-              url={'https://docs.rollup.id/getting-started/create-an-application'}
+              url={
+                'https://docs.rollup.id/getting-started/create-an-application'
+              }
             />
           </div>
         </li>
@@ -565,7 +728,9 @@ const CongratsPage = ({
           <div className="flex flex-row gap-2 items-center">
             <Text>Learn about OIDC / OAuth 2.0</Text>
             <DocumentationBadge
-              url={'https://docs.rollup.id/an-introduction-to-openid-connect-oidc'}
+              url={
+                'https://docs.rollup.id/an-introduction-to-openid-connect-oidc'
+              }
             />
           </div>
         </li>
@@ -593,18 +758,30 @@ const CongratsPage = ({
 }
 
 export default function Landing() {
-  const { connectedEmails, PASSPORT_URL, currentPage } = useOutletContext<{
-    connectedEmails: DropdownSelectListItem[]
-    PASSPORT_URL: string
-    currentPage: number
-  }>()
+  const { connectedEmails, PASSPORT_URL, currentPage, targetIG } =
+    useOutletContext<{
+      connectedEmails: DropdownSelectListItem[]
+      PASSPORT_URL: string
+      currentPage: number
+      targetIG:
+        | undefined
+        | {
+            name: string
+            URN: IdentityGroupURN
+          }
+    }>()
 
   // Currently 'team' is not an option. It is here for future use.
-  const [orgType, setOrgType] = useState<'solo' | 'team'>('solo')
+  const [orgType, setOrgType] = useState<'solo' | 'team'>(
+    targetIG ? 'team' : 'solo'
+  )
   const [clientId, setClientId] = useState('')
   const [emailAccountURN, setEmailAccountURN] = useState<AccountURN>()
 
   const [page, setPage] = useState(currentPage)
+  const [groupID, setGroupID] = useState(
+    targetIG ? targetIG.URN.split('/')[1] : ''
+  )
 
   return (
     <div
@@ -625,18 +802,41 @@ export default function Landing() {
         page={page}
         setEmailAccountURN={setEmailAccountURN}
       />
-      {orgType === 'team' ? (
-        <CreateGroup setPage={setPage} page={page} />
-      ) : (
-        <CreateApp
+      {targetIG && (
+        <EnrollToGroup
+          groupName={targetIG.name}
           setPage={setPage}
           page={page}
-          setClientId={setClientId}
-          emailAccountURN={emailAccountURN}
         />
       )}
+
+      {!targetIG && (
+        <>
+          {orgType === 'team' ? (
+            <>
+              {emailAccountURN && (
+                <CreateGroup
+                  setPage={setPage}
+                  page={page}
+                  setGroupID={setGroupID}
+                />
+              )}
+            </>
+          ) : (
+            <CreateApp
+              setPage={setPage}
+              page={page}
+              setClientId={setClientId}
+              emailAccountURN={emailAccountURN}
+            />
+          )}
+        </>
+      )}
+
       <CongratsPage
-        navigateUrl={orgType === 'solo' ? `/apps/${clientId}` : `/dashboard`}
+        navigateUrl={
+          orgType === 'solo' ? `/apps/${clientId}` : `/groups/${groupID}`
+        }
         page={page}
         navigateText={
           orgType === 'solo' ? 'Go to my Application' : 'Go to my Group'
diff --git a/platform/identity/src/jsonrpc/methods/identity-groups/createIdentityGroup.ts b/platform/identity/src/jsonrpc/methods/identity-groups/createIdentityGroup.ts
index c8780a0785..26e42569d5 100644
--- a/platform/identity/src/jsonrpc/methods/identity-groups/createIdentityGroup.ts
+++ b/platform/identity/src/jsonrpc/methods/identity-groups/createIdentityGroup.ts
@@ -13,16 +13,20 @@ import { createAnalyticsEvent } from '@proofzero/utils/analytics'
 export const CreateIdentityGroupInputSchema = z.object({
   name: z.string(),
 })
-
 type CreateIdentityGroupInput = z.infer<typeof CreateIdentityGroupInputSchema>
 
+export const CreateIdentityGroupOutputSchema = z.object({
+  groupID: z.string(),
+})
+type CreateIdentityGroupOutput = z.infer<typeof CreateIdentityGroupOutputSchema>
+
 export const createIdentityGroup = async ({
   input,
   ctx,
 }: {
   input: CreateIdentityGroupInput
   ctx: Context
-}): Promise<void> => {
+}): Promise<CreateIdentityGroupOutput> => {
   const name = hexlify(randomBytes(IDENTITY_GROUP_OPTIONS.length))
   const groupURN = IdentityGroupURNSpace.componentizedUrn(name, undefined, {
     name: input.name,
@@ -69,4 +73,8 @@ export const createIdentityGroup = async ({
       },
     })
   )
+
+  return {
+    groupID: name,
+  }
 }
diff --git a/platform/identity/src/jsonrpc/router.ts b/platform/identity/src/jsonrpc/router.ts
index fc1e59d7ec..3679973de4 100644
--- a/platform/identity/src/jsonrpc/router.ts
+++ b/platform/identity/src/jsonrpc/router.ts
@@ -49,6 +49,7 @@ import {
 import { UnauthorizedError } from '@proofzero/errors'
 import {
   CreateIdentityGroupInputSchema,
+  CreateIdentityGroupOutputSchema,
   createIdentityGroup,
 } from './methods/identity-groups/createIdentityGroup'
 import {
@@ -194,6 +195,7 @@ export const appRouter = t.router({
     .use(LogUsage)
     .use(Analytics)
     .input(CreateIdentityGroupInputSchema)
+    .output(CreateIdentityGroupOutputSchema)
     .mutation(createIdentityGroup),
   listIdentityGroups: t.procedure
     .use(AuthorizationTokenFromHeader)