diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 95d383345ec6..45c2d152542d 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -2,6 +2,7 @@ import type {ValueOf} from 'type-fest';
 import type CONST from './CONST';
 import type * as FormTypes from './types/form';
 import type * as OnyxTypes from './types/onyx';
+import type Onboarding from './types/onyx/Onboarding';
 import type AssertTypesEqual from './types/utils/AssertTypesEqual';
 import type DeepValueOf from './types/utils/DeepValueOf';
 
@@ -114,6 +115,9 @@ const ONYXKEYS = {
     /** Boolean flag only true when first set */
     NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER: 'nvp_isFirstTimeNewExpensifyUser',
 
+    /** This NVP contains information about whether the onboarding flow was completed or not */
+    NVP_ONBOARDING: 'nvp_onboarding',
+
     /** Contains the user preference for the LHN priority mode */
     NVP_PRIORITY_MODE: 'nvp_priorityMode',
 
@@ -565,6 +569,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.ACCOUNT]: OnyxTypes.Account;
     [ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID]: string;
     [ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER]: boolean;
+    [ONYXKEYS.NVP_ONBOARDING]: Onboarding | [];
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
     [ONYXKEYS.DEVICE_ID]: string;
     [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index a8cb1847ccc1..809f0778c3e4 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -440,10 +440,6 @@ const ROUTES = {
     NEW_TASK_TITLE: 'new/task/title',
     NEW_TASK_DESCRIPTION: 'new/task/description',
 
-    ONBOARD: 'onboard',
-    ONBOARD_MANAGE_EXPENSES: 'onboard/manage-expenses',
-    ONBOARD_EXPENSIFY_CLASSIC: 'onboard/expensify-classic',
-
     TEACHERS_UNITE: 'settings/teachersunite',
     I_KNOW_A_TEACHER: 'settings/teachersunite/i-know-a-teacher',
     I_AM_A_TEACHER: 'settings/teachersunite/i-am-a-teacher',
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index c6658c2f6578..bf3cedbb738b 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -116,7 +116,6 @@ const SCREENS = {
         PARTICIPANTS: 'Participants',
         MONEY_REQUEST: 'MoneyRequest',
         NEW_TASK: 'NewTask',
-        ONBOARD_ENGAGEMENT: 'Onboard_Engagement',
         TEACHERS_UNITE: 'TeachersUnite',
         TASK_DETAILS: 'Task_Details',
         ENABLE_PAYMENTS: 'EnablePayments',
@@ -306,12 +305,6 @@ const SCREENS = {
         WORK: 'Onboarding_Work',
     },
 
-    ONBOARD_ENGAGEMENT: {
-        ROOT: 'Onboard_Engagement_Root',
-        MANAGE_TEAMS_EXPENSES: 'Manage_Teams_Expenses',
-        EXPENSIFY_CLASSIC: 'Expenisfy_Classic',
-    },
-
     WELCOME_VIDEO: {
         ROOT: 'Welcome_Video_Root',
     },
diff --git a/src/components/OnboardingWelcomeVideo.tsx b/src/components/OnboardingWelcomeVideo.tsx
index 257bd1b9c457..6858d29f4d3c 100644
--- a/src/components/OnboardingWelcomeVideo.tsx
+++ b/src/components/OnboardingWelcomeVideo.tsx
@@ -140,7 +140,7 @@ function OnboardingWelcomeVideo() {
                             <View style={shouldUseNarrowLayout ? {padding: MODAL_PADDING} : {paddingHorizontal: MODAL_PADDING}}>{getWelcomeVideo()}</View>
                             <View style={[shouldUseNarrowLayout ? [styles.mt5, styles.mh8] : [styles.mt5, styles.mh5]]}>
                                 <View style={[shouldUseNarrowLayout ? [styles.gap1, styles.mb8] : [styles.mb10]]}>
-                                    <Text style={[styles.textHeadlineH1, styles.textXXLarge]}>{translate('onboarding.welcomeVideo.title')}</Text>
+                                    <Text style={[styles.textHeadlineH1]}>{translate('onboarding.welcomeVideo.title')}</Text>
                                     <Text style={styles.textSupporting}>{translate('onboarding.welcomeVideo.description')}</Text>
                                 </View>
                                 <Button
diff --git a/src/components/TestToolMenu.tsx b/src/components/TestToolMenu.tsx
index 165b438a1d4c..e4d33957f7f1 100644
--- a/src/components/TestToolMenu.tsx
+++ b/src/components/TestToolMenu.tsx
@@ -93,17 +93,6 @@ function TestToolMenu({user = USER_DEFAULT, network}: TestToolMenuProps) {
                 />
             </TestToolRow>
 
-            {/* Navigate to the new Onboarding flow (Stage 1). This button is temporary and should be removed after passing QA tests. */}
-            <TestToolRow title="Onboarding Flow">
-                <Button
-                    small
-                    text="Navigate"
-                    onPress={() => {
-                        Navigation.dismissModal();
-                        Navigation.navigate(ROUTES.ONBOARDING_PURPOSE);
-                    }}
-                />
-            </TestToolRow>
             {/* Navigate to the new Search Page. This button is temporary and should be removed after passing QA tests. */}
             <TestToolRow title="New Search Page">
                 <Button
diff --git a/src/components/VideoPlayer/BaseVideoPlayer.tsx b/src/components/VideoPlayer/BaseVideoPlayer.tsx
index 0138e2f870e1..066dbbff3b5d 100644
--- a/src/components/VideoPlayer/BaseVideoPlayer.tsx
+++ b/src/components/VideoPlayer/BaseVideoPlayer.tsx
@@ -297,7 +297,7 @@ function BaseVideoPlayer({
                                     }
                                     togglePlayCurrentVideo();
                                 }}
-                                style={styles.flex1}
+                                style={[styles.flex1, styles.noSelect]}
                             >
                                 {shouldUseSharedVideoElement ? (
                                     <>
diff --git a/src/languages/en.ts b/src/languages/en.ts
index eaa81be2a711..d3ffbc9bb368 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2741,28 +2741,6 @@ export default {
         },
         copyReferralLink: 'Copy invite link',
     },
-    purposeForExpensify: {
-        [CONST.INTRO_CHOICES.TRACK]: 'Track business spend for taxes',
-        [CONST.INTRO_CHOICES.SUBMIT]: 'Get paid back by my employer',
-        [CONST.INTRO_CHOICES.MANAGE_TEAM]: "Manage my team's expenses",
-        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chat and split expenses with friends',
-        welcomeMessage: 'Welcome to Expensify',
-        welcomeSubtitle: 'What would you like to do?',
-    },
-    manageTeams: {
-        [CONST.MANAGE_TEAMS_CHOICE.MULTI_LEVEL]: 'Multi level approval',
-        [CONST.MANAGE_TEAMS_CHOICE.CUSTOM_EXPENSE]: 'Custom expense coding',
-        [CONST.MANAGE_TEAMS_CHOICE.CARD_TRACKING]: 'Company card tracking',
-        [CONST.MANAGE_TEAMS_CHOICE.ACCOUNTING]: 'Accounting integrations',
-        [CONST.MANAGE_TEAMS_CHOICE.RULE]: 'Rule enforcement',
-        title: 'Do you require any of the following features?',
-    },
-    expensifyClassic: {
-        title: "Expensify Classic has everything you'll need",
-        firstDescription: "While we're busy working on New Expensify, it currently doesn't support some of the features you're looking for.",
-        secondDescription: "Don't worry, Expensify Classic has everything you need.",
-        buttonText: 'Take me to Expensify Classic',
-    },
     violations: {
         allTagLevelsRequired: 'All tags required',
         autoReportedRejectedExpense: ({rejectReason, rejectedBy}: ViolationsAutoReportedRejectedExpenseParams) => `${rejectedBy} rejected this expense with the comment "${rejectReason}"`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 688083270fbb..0980ec5dcac5 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3234,28 +3234,6 @@ export default {
         },
         copyReferralLink: 'Copiar enlace de invitación',
     },
-    purposeForExpensify: {
-        [CONST.INTRO_CHOICES.TRACK]: 'Seguimiento de los gastos de empresa para fines fiscales',
-        [CONST.INTRO_CHOICES.SUBMIT]: 'Reclamar gastos a mi empleador',
-        [CONST.INTRO_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
-        [CONST.INTRO_CHOICES.CHAT_SPLIT]: 'Chatea y divide gastos con tus amigos',
-        welcomeMessage: 'Bienvenido a Expensify',
-        welcomeSubtitle: '¿Qué te gustaría hacer?',
-    },
-    manageTeams: {
-        [CONST.MANAGE_TEAMS_CHOICE.MULTI_LEVEL]: 'Aprobación multinivel',
-        [CONST.MANAGE_TEAMS_CHOICE.CUSTOM_EXPENSE]: 'Codificación personalizada de gastos',
-        [CONST.MANAGE_TEAMS_CHOICE.CARD_TRACKING]: 'Seguimiento de tarjetas corporativas',
-        [CONST.MANAGE_TEAMS_CHOICE.ACCOUNTING]: 'Integraciones de contaduría',
-        [CONST.MANAGE_TEAMS_CHOICE.RULE]: 'Aplicación de reglas',
-        title: '¿Necesitas alguna de las siguientes funciones?',
-    },
-    expensifyClassic: {
-        title: 'Expensify Classic tiene todo lo que necesitas',
-        firstDescription: 'Aunque estamos ocupados trabajando en el Nuevo Expensify, actualmente no soporta algunas de las funciones que estás buscando.',
-        secondDescription: 'No te preocupes, Expensify Classic tiene todo lo que necesitas.',
-        buttonText: 'Llévame a Expensify Classic',
-    },
     violations: {
         allTagLevelsRequired: 'Todas las etiquetas son obligatorias',
         autoReportedRejectedExpense: ({rejectedBy, rejectReason}: ViolationsAutoReportedRejectedExpenseParams) => `${rejectedBy} rechazó la solicitud y comentó "${rejectReason}"`,
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index bc6d9decf6ec..c1ead29096b2 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -12,7 +12,6 @@ import type {
     MoneyRequestNavigatorParamList,
     NewChatNavigatorParamList,
     NewTaskNavigatorParamList,
-    OnboardEngagementNavigatorParamList,
     ParticipantsNavigatorParamList,
     PrivateNotesNavigatorParamList,
     ProfileNavigatorParamList,
@@ -166,12 +165,6 @@ const NewTaskModalStackNavigator = createModalStackNavigator<NewTaskNavigatorPar
     [SCREENS.NEW_TASK.DESCRIPTION]: () => require('../../../../pages/tasks/NewTaskDescriptionPage').default as React.ComponentType,
 });
 
-const OnboardEngagementModalStackNavigator = createModalStackNavigator<OnboardEngagementNavigatorParamList>({
-    [SCREENS.ONBOARD_ENGAGEMENT.ROOT]: () => require('../../../../pages/OnboardEngagement/PurposeForUsingExpensifyPage').default as React.ComponentType,
-    [SCREENS.ONBOARD_ENGAGEMENT.MANAGE_TEAMS_EXPENSES]: () => require('../../../../pages/OnboardEngagement/ManageTeamsExpensesPage').default as React.ComponentType,
-    [SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC]: () => require('../../../../pages/OnboardEngagement/ExpensifyClassicPage').default as React.ComponentType,
-});
-
 const NewTeachersUniteNavigator = createModalStackNavigator<TeachersUniteNavigatorParamList>({
     [SCREENS.SAVE_THE_WORLD.ROOT]: () => require('../../../../pages/TeachersUnite/SaveTheWorldPage').default as React.ComponentType,
     [SCREENS.I_KNOW_A_TEACHER]: () => require('../../../../pages/TeachersUnite/KnowATeacherPage').default as React.ComponentType,
@@ -345,7 +338,6 @@ const ProcessMoneyRequestHoldStackNavigator = createModalStackNavigator({
 export {
     AddPersonalBankAccountModalStackNavigator,
     DetailsModalStackNavigator,
-    OnboardEngagementModalStackNavigator,
     EditRequestStackNavigator,
     EnablePaymentsStackNavigator,
     FlagCommentStackNavigator,
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index c421bdc82028..93d2f8fba989 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -85,10 +85,6 @@ function RightModalNavigator({navigation}: RightModalNavigatorProps) {
                         name={SCREENS.RIGHT_MODAL.NEW_TASK}
                         component={ModalStackNavigators.NewTaskModalStackNavigator}
                     />
-                    <Stack.Screen
-                        name={SCREENS.RIGHT_MODAL.ONBOARD_ENGAGEMENT}
-                        component={ModalStackNavigators.OnboardEngagementModalStackNavigator}
-                    />
                     <Stack.Screen
                         name={SCREENS.RIGHT_MODAL.TEACHERS_UNITE}
                         component={ModalStackNavigators.NewTeachersUniteNavigator}
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
index 0be4ac5518f3..6c6146199dce 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
@@ -49,16 +49,7 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps
             return;
         }
 
-        Welcome.isOnboardingFlowCompleted({
-            onNotCompleted: () =>
-                Navigation.navigate(
-                    // Uncomment once Stage 1 Onboarding Flow is ready
-                    //
-                    // ROUTES.ONBOARDING_PERSONAL_DETAILS
-                    //
-                    ROUTES.ONBOARD,
-                ),
-        });
+        Welcome.isOnboardingFlowCompleted({onNotCompleted: () => Navigation.navigate(ROUTES.ONBOARDING_ROOT)});
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isLoadingApp]);
 
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index ca6264e00917..f309b19563e1 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -528,13 +528,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.NEW_TASK.DESCRIPTION]: ROUTES.NEW_TASK_DESCRIPTION,
                     },
                 },
-                [SCREENS.RIGHT_MODAL.ONBOARD_ENGAGEMENT]: {
-                    screens: {
-                        [SCREENS.ONBOARD_ENGAGEMENT.ROOT]: ROUTES.ONBOARD,
-                        [SCREENS.ONBOARD_ENGAGEMENT.MANAGE_TEAMS_EXPENSES]: ROUTES.ONBOARD_MANAGE_EXPENSES,
-                        [SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC]: ROUTES.ONBOARD_EXPENSIFY_CLASSIC,
-                    },
-                },
                 [SCREENS.RIGHT_MODAL.TEACHERS_UNITE]: {
                     screens: {
                         [SCREENS.I_KNOW_A_TEACHER]: ROUTES.I_KNOW_A_TEACHER,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index de26a81276ef..87fad1064e75 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -549,12 +549,6 @@ type NewTaskNavigatorParamList = {
     [SCREENS.NEW_TASK.DESCRIPTION]: undefined;
 };
 
-type OnboardEngagementNavigatorParamList = {
-    [SCREENS.ONBOARD_ENGAGEMENT.ROOT]: undefined;
-    [SCREENS.ONBOARD_ENGAGEMENT.MANAGE_TEAMS_EXPENSES]: undefined;
-    [SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC]: undefined;
-};
-
 type TeachersUniteNavigatorParamList = {
     [SCREENS.SAVE_THE_WORLD.ROOT]: undefined;
     [SCREENS.I_KNOW_A_TEACHER]: undefined;
@@ -659,7 +653,6 @@ type RightModalNavigatorParamList = {
     [SCREENS.RIGHT_MODAL.ROOM_INVITE]: NavigatorScreenParams<RoomInviteNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.MONEY_REQUEST]: NavigatorScreenParams<MoneyRequestNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.NEW_TASK]: NavigatorScreenParams<NewTaskNavigatorParamList>;
-    [SCREENS.RIGHT_MODAL.ONBOARD_ENGAGEMENT]: NavigatorScreenParams<OnboardEngagementNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.TEACHERS_UNITE]: NavigatorScreenParams<TeachersUniteNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.TASK_DETAILS]: NavigatorScreenParams<TaskDetailsNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.ENABLE_PAYMENTS]: NavigatorScreenParams<EnablePaymentsNavigatorParamList>;
@@ -863,7 +856,6 @@ export type {
     NavigationStateRoute,
     NewChatNavigatorParamList,
     NewTaskNavigatorParamList,
-    OnboardEngagementNavigatorParamList,
     OnboardingModalNavigatorParamList,
     ParticipantsNavigatorParamList,
     PrivateNotesNavigatorParamList,
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 52cd4469f253..cef66487a438 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -40,6 +40,7 @@ import * as Device from '@userActions/Device';
 import * as PriorityMode from '@userActions/PriorityMode';
 import redirectToSignIn from '@userActions/SignInRedirect';
 import Timing from '@userActions/Timing';
+import * as Welcome from '@userActions/Welcome';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -648,6 +649,7 @@ function resetHomeRouteParams() {
 function cleanupSession() {
     Pusher.disconnect();
     Timers.clearAll();
+    Welcome.resetAllChecks();
     PriorityMode.resetHasReadRequiredDataFromStorage();
     MainQueue.clear();
     HttpUtils.cancelPendingRequests();
diff --git a/src/libs/actions/Welcome.ts b/src/libs/actions/Welcome.ts
index 84066c05e80e..d723d3a5cd6d 100644
--- a/src/libs/actions/Welcome.ts
+++ b/src/libs/actions/Welcome.ts
@@ -2,32 +2,26 @@ import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {OnboardingPurposeType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type Onboarding from '@src/types/onyx/Onboarding';
 import type OnyxPolicy from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 
-let hasSelectedPurpose: boolean | undefined;
-let hasProvidedPersonalDetails: boolean | undefined;
-let isFirstTimeNewExpensifyUser: boolean | undefined;
+let onboarding: Onboarding | [] | undefined;
 let hasDismissedModal: boolean | undefined;
 let isLoadingReportData = true;
 
-type DetermineOnboardingStatusProps = {
-    onAble?: () => void;
-    onNotAble?: () => void;
-};
-
 type HasCompletedOnboardingFlowProps = {
     onCompleted?: () => void;
     onNotCompleted?: () => void;
 };
 
 let resolveIsReadyPromise: (value?: Promise<void>) => void | undefined;
-const isServerDataReadyPromise = new Promise<void>((resolve) => {
+let isServerDataReadyPromise = new Promise<void>((resolve) => {
     resolveIsReadyPromise = resolve;
 });
 
 let resolveOnboardingFlowStatus: (value?: Promise<void>) => void | undefined;
-const isOnboardingFlowStatusKnownPromise = new Promise<void>((resolve) => {
+let isOnboardingFlowStatusKnownPromise = new Promise<void>((resolve) => {
     resolveOnboardingFlowStatus = resolve;
 });
 
@@ -35,81 +29,40 @@ function onServerDataReady(): Promise<void> {
     return isServerDataReadyPromise;
 }
 
-/**
- * Checks if Onyx keys required to determine the
- * onboarding flow status have been loaded (namely,
- * are not undefined).
- */
-function isAbleToDetermineOnboardingStatus({onAble, onNotAble}: DetermineOnboardingStatusProps) {
-    const hasRequiredOnyxKeysBeenLoaded = [hasProvidedPersonalDetails, hasSelectedPurpose].every((value) => value !== undefined);
-
-    if (hasRequiredOnyxKeysBeenLoaded) {
-        onAble?.();
-    } else {
-        onNotAble?.();
-    }
-}
-
-/**
- * A promise returning the onboarding flow status.
- * Returns true if user has completed the onboarding
- * flow, false otherwise.
- */
 function isOnboardingFlowCompleted({onCompleted, onNotCompleted}: HasCompletedOnboardingFlowProps) {
     isOnboardingFlowStatusKnownPromise.then(() => {
-        // Remove once Stage 1 Onboarding Flow is ready
-        if (!isFirstTimeNewExpensifyUser) {
+        if (Array.isArray(onboarding) || onboarding?.hasCompletedGuidedSetupFlow === undefined) {
             return;
         }
 
-        // Uncomment once Stage 1 Onboarding Flow is ready
-        //
-        // const onboardingFlowCompleted = hasProvidedPersonalDetails && hasSelectedPurpose;
-        //
-        const onboardingFlowCompleted = hasSelectedPurpose;
-
-        if (onboardingFlowCompleted) {
+        if (onboarding?.hasCompletedGuidedSetupFlow) {
             onCompleted?.();
         } else {
-            // Remove once Stage 1 Onboarding Flow is ready
-            // This key is only updated when we call ReconnectApp, setting it to false now allows the user to navigate normally instead of always redirecting to the workspace chat
-            Onyx.set(ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER, false);
-
             onNotCompleted?.();
         }
     });
 }
 
 /**
- * Check that a few requests have completed so that the welcome action can proceed:
- *
- * - Whether we are a first time new expensify user
- * - Whether we have loaded all policies the server knows about
- * - Whether we have loaded all reports the server knows about
+ * Check if onboarding data is ready in order to check if the user has completed onboarding or not
  */
-function checkOnReady() {
-    const hasRequiredOnyxKeysBeenLoaded = [isFirstTimeNewExpensifyUser, hasDismissedModal].every((value) => value !== undefined);
-
-    if (isLoadingReportData || !hasRequiredOnyxKeysBeenLoaded) {
+function checkOnboardingDataReady() {
+    if (onboarding === undefined) {
         return;
     }
 
-    resolveIsReadyPromise?.();
+    resolveOnboardingFlowStatus?.();
 }
 
-function getPersonalDetails(accountID: number | undefined) {
-    Onyx.connect({
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        initWithStoredValues: true,
-        callback: (value) => {
-            if (!value || !accountID) {
-                return;
-            }
-
-            hasProvidedPersonalDetails = !!value[accountID]?.firstName && !!value[accountID]?.lastName;
-            isAbleToDetermineOnboardingStatus({onAble: resolveOnboardingFlowStatus});
-        },
-    });
+/**
+ * Check if user dismissed modal and if report data are loaded
+ */
+function checkServerDataReady() {
+    if (isLoadingReportData || hasDismissedModal === undefined) {
+        return;
+    }
+
+    resolveIsReadyPromise?.();
 }
 
 function setOnboardingPurposeSelected(value: OnboardingPurposeType) {
@@ -117,24 +70,16 @@ function setOnboardingPurposeSelected(value: OnboardingPurposeType) {
 }
 
 Onyx.connect({
-    key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
+    key: ONYXKEYS.NVP_ONBOARDING,
     initWithStoredValues: false,
     callback: (value) => {
-        // If isFirstTimeNewExpensifyUser was true do not update it to false. We update it to false inside the Welcome.show logic
-        // More context here https://github.com/Expensify/App/pull/16962#discussion_r1167351359
-
-        isFirstTimeNewExpensifyUser = value ?? undefined;
+        if (value === null) {
+            return;
+        }
 
-        checkOnReady();
-    },
-});
+        onboarding = value;
 
-Onyx.connect({
-    key: ONYXKEYS.NVP_INTRO_SELECTED,
-    initWithStoredValues: true,
-    callback: (value) => {
-        hasSelectedPurpose = !!value;
-        isAbleToDetermineOnboardingStatus({onAble: resolveOnboardingFlowStatus});
+        checkOnboardingDataReady();
     },
 });
 
@@ -144,7 +89,7 @@ Onyx.connect({
     callback: (value) => {
         hasDismissedModal = value ?? false;
 
-        checkOnReady();
+        checkServerDataReady();
     },
 });
 
@@ -153,7 +98,7 @@ Onyx.connect({
     initWithStoredValues: false,
     callback: (value) => {
         isLoadingReportData = value ?? false;
-        checkOnReady();
+        checkServerDataReady();
     },
 });
 
@@ -174,15 +119,15 @@ Onyx.connect({
     },
 });
 
-Onyx.connect({
-    key: ONYXKEYS.SESSION,
-    callback: (val, key) => {
-        if (!val || !key) {
-            return;
-        }
-
-        getPersonalDetails(val.accountID);
-    },
-});
+function resetAllChecks() {
+    isServerDataReadyPromise = new Promise((resolve) => {
+        resolveIsReadyPromise = resolve;
+    });
+    isOnboardingFlowStatusKnownPromise = new Promise((resolve) => {
+        resolveOnboardingFlowStatus = resolve;
+    });
+    onboarding = undefined;
+    isLoadingReportData = true;
+}
 
-export {onServerDataReady, isOnboardingFlowCompleted, setOnboardingPurposeSelected};
+export {onServerDataReady, isOnboardingFlowCompleted, setOnboardingPurposeSelected, resetAllChecks};
diff --git a/src/pages/OnboardEngagement/ExpensifyClassicPage.tsx b/src/pages/OnboardEngagement/ExpensifyClassicPage.tsx
deleted file mode 100644
index 7b242dd4aefa..000000000000
--- a/src/pages/OnboardEngagement/ExpensifyClassicPage.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import Button from '@components/Button';
-import HeaderPageLayout from '@components/HeaderPageLayout';
-import Icon from '@components/Icon';
-import * as Expensicons from '@components/Icon/Expensicons';
-import Text from '@components/Text';
-import useLocalize from '@hooks/useLocalize';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import Navigation from '@libs/Navigation/Navigation';
-import variables from '@styles/variables';
-import * as Link from '@userActions/Link';
-import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
-
-function ExpensifyClassicModal() {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const {isExtraSmallScreenHeight} = useWindowDimensions();
-    const theme = useTheme();
-
-    const navigateBack = () => {
-        Navigation.goBack(ROUTES.ONBOARD_MANAGE_EXPENSES);
-    };
-
-    const navigateToOldDot = () => {
-        Link.openOldDotLink(`${CONST.OLDDOT_URLS.INBOX}${CONST.OLDDOT_URLS.DISMMISSED_REASON}`);
-    };
-
-    return (
-        <HeaderPageLayout
-            title="Expensify Classic"
-            onBackButtonPress={navigateBack}
-            backgroundColor={theme.PAGE_THEMES[SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC].backgroundColor}
-            testID={ExpensifyClassicModal.displayName}
-            headerContainerStyles={[styles.staticHeaderImage, styles.justifyContentCenter]}
-            headerContent={
-                <Icon
-                    src={Expensicons.OldDotWireframe}
-                    width={variables.oldDotWireframeIconWidth}
-                    height={variables.oldDotWireframeIconHeight}
-                />
-            }
-            footer={
-                <Button
-                    success
-                    pressOnEnter
-                    medium={isExtraSmallScreenHeight}
-                    large={!isExtraSmallScreenHeight}
-                    style={[styles.w100, styles.mtAuto]}
-                    text={translate('expensifyClassic.buttonText')}
-                    onPress={navigateToOldDot}
-                />
-            }
-        >
-            <View style={styles.ph5}>
-                <Text
-                    style={[styles.textHeadline, styles.preWrap, styles.mb2]}
-                    numberOfLines={2}
-                >
-                    {translate('expensifyClassic.title')}
-                </Text>
-                <Text style={[styles.mb4]}>{translate('expensifyClassic.firstDescription')}</Text>
-                <Text>{translate('expensifyClassic.secondDescription')}</Text>
-            </View>
-        </HeaderPageLayout>
-    );
-}
-
-ExpensifyClassicModal.displayName = 'ExpensifyClassicModal';
-
-export default ExpensifyClassicModal;
diff --git a/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx b/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx
deleted file mode 100644
index c6ec7dc49b9f..000000000000
--- a/src/pages/OnboardEngagement/ManageTeamsExpensesPage.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import React, {useMemo} from 'react';
-import {View} from 'react-native';
-import Button from '@components/Button';
-import FixedFooter from '@components/FixedFooter';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import * as Expensicons from '@components/Icon/Expensicons';
-import type {MenuItemProps} from '@components/MenuItem';
-import MenuItemList from '@components/MenuItemList';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
-import Text from '@components/Text';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import Navigation from '@libs/Navigation/Navigation';
-import * as Report from '@userActions/Report';
-import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
-
-const menuIcons = {
-    [CONST.MANAGE_TEAMS_CHOICE.MULTI_LEVEL]: Expensicons.Task,
-    [CONST.MANAGE_TEAMS_CHOICE.CUSTOM_EXPENSE]: Expensicons.ReceiptSearch,
-    [CONST.MANAGE_TEAMS_CHOICE.CARD_TRACKING]: Expensicons.CreditCard,
-    [CONST.MANAGE_TEAMS_CHOICE.ACCOUNTING]: Expensicons.Sync,
-    [CONST.MANAGE_TEAMS_CHOICE.RULE]: Expensicons.Gear,
-};
-
-// This is not translated because it is a message coming from concierge, which only supports english
-const messageCopy =
-    "Here's how to manage your team's expenses:\n" +
-    '\n' +
-    '1. Click the green *+* > *New workspace*.\n' +
-    '2. Your new workspace is now active.\n' +
-    '3. To update your workspace name, click *Profile* > *Name*.\n' +
-    '\n' +
-    'Next, click *Members* to invite your team to your workspace, then add your business bank account to reimburse them!';
-
-function ManageTeamsExpensesModal() {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const {isExtraSmallScreenHeight} = useWindowDimensions();
-
-    const menuItems: MenuItemProps[] = useMemo(
-        () =>
-            Object.values(CONST.MANAGE_TEAMS_CHOICE).map((choice) => {
-                const translationKey = `manageTeams.${choice}` as const;
-                return {
-                    key: translationKey,
-                    title: translate(translationKey),
-                    icon: menuIcons[choice],
-                    numberOfLinesTitle: 2,
-                    interactive: false,
-                };
-            }),
-        [translate],
-    );
-
-    const completeEngagement = () => {
-        Report.completeEngagementModal(CONST.INTRO_CHOICES.MANAGE_TEAM, messageCopy);
-        Report.navigateToConciergeChat();
-    };
-
-    const navigateBack = () => {
-        Navigation.goBack(ROUTES.ONBOARD);
-    };
-
-    const navigateToExpensifyClassicPage = () => {
-        Navigation.navigate(ROUTES.ONBOARD_EXPENSIFY_CLASSIC);
-    };
-
-    return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom
-            testID={ManageTeamsExpensesModal.displayName}
-        >
-            <View style={[styles.flex1]}>
-                <HeaderWithBackButton
-                    shouldShowBackButton
-                    onBackButtonPress={navigateBack}
-                />
-
-                <ScrollView contentContainerStyle={styles.flex1}>
-                    <View style={[styles.w100, styles.ph5]}>
-                        <Text
-                            style={[styles.textHeadline, styles.preWrap, styles.mb2]}
-                            numberOfLines={2}
-                        >
-                            {translate('manageTeams.title')}
-                        </Text>
-                    </View>
-                    <MenuItemList
-                        menuItems={menuItems}
-                        shouldUseSingleExecution
-                    />
-                </ScrollView>
-                <FixedFooter>
-                    <View style={styles.flexRow}>
-                        <Button
-                            medium={isExtraSmallScreenHeight}
-                            large={!isExtraSmallScreenHeight}
-                            style={[styles.flexGrow1, styles.mr1, styles.mtAuto]}
-                            text={translate('common.no')}
-                            onPress={completeEngagement}
-                        />
-                        <Button
-                            pressOnEnter
-                            medium={isExtraSmallScreenHeight}
-                            large={!isExtraSmallScreenHeight}
-                            style={[styles.flexGrow1, styles.ml1, styles.mtAuto]}
-                            text={translate('common.yes')}
-                            onPress={navigateToExpensifyClassicPage}
-                        />
-                    </View>
-                </FixedFooter>
-            </View>
-        </ScreenWrapper>
-    );
-}
-
-ManageTeamsExpensesModal.displayName = 'ManageTeamsExpensesModal';
-
-export default ManageTeamsExpensesModal;
diff --git a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx b/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
deleted file mode 100644
index 0618a2bcc5b1..000000000000
--- a/src/pages/OnboardEngagement/PurposeForUsingExpensifyPage.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import React, {useCallback, useMemo} from 'react';
-import {View} from 'react-native';
-import type {ValueOf} from 'type-fest';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import * as Expensicons from '@components/Icon/Expensicons';
-import Lottie from '@components/Lottie';
-import LottieAnimations from '@components/LottieAnimations';
-import type {MenuItemProps} from '@components/MenuItem';
-import MenuItemList from '@components/MenuItemList';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
-import Text from '@components/Text';
-import useLocalize from '@hooks/useLocalize';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import Navigation from '@libs/Navigation/Navigation';
-import * as Report from '@userActions/Report';
-import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
-
-// This is not translated because it is a message coming from concierge, which only supports english
-const messageCopy = {
-    [CONST.INTRO_CHOICES.TRACK]:
-        "Here's how to start tracking business spend for taxes:\n" +
-        '\n' +
-        '1. Click the green *+* > *New workspace*.\n' +
-        '2. Your new workspace is now active.\n' +
-        '3. To update your workspace name, click *Profile* > *Name*.\n' +
-        '\n' +
-        'Next, start adding expenses to your workspace:\n' +
-        '\n' +
-        '1. Click the green *+* > *Submit expense*.\n' +
-        '2. Add an expense or scan a receipt.\n' +
-        '3. Choose your workspace as the destination.\n' +
-        '\n' +
-        'Be sure to track all of your expenses in your new workspace to keep everything organized. Let me know how it goes!',
-    [CONST.INTRO_CHOICES.SUBMIT]:
-        "Here's how to submit expenses for reimbursement:\n" +
-        '\n' +
-        '1. Click the green *+* > *Submit expense*.\n' +
-        '2. Add an expense or scan a receipt.\n' +
-        "3. Enter your reimburser's email or phone number.\n" +
-        '\n' +
-        "And we'll take it from there to get you paid back. Give it a shot and let me know how it goes!",
-    [CONST.INTRO_CHOICES.MANAGE_TEAM]: '',
-    [CONST.INTRO_CHOICES.CHAT_SPLIT]:
-        "Here's how to split expenses with friends:\n" +
-        '\n' +
-        '1. Tap the green *+* > *Split expense*.\n' +
-        '2. Add an expense or scan a receipt.\n' +
-        "3. Enter your friend's email or phone number.\n" +
-        '4. Select the option.\n' +
-        '5. Repeat for any additional friends.\n' +
-        "6. Tap *Add to split* when you're done.\n" +
-        '7. Review and tap *Split* to split your expense(s).\n' +
-        '\n' +
-        "We'll submit an expense to each of your friends and make sure you get paid back. Let me know how it goes!",
-};
-
-const menuIcons = {
-    [CONST.INTRO_CHOICES.TRACK]: Expensicons.ReceiptSearch,
-    [CONST.INTRO_CHOICES.SUBMIT]: Expensicons.Scan,
-    [CONST.INTRO_CHOICES.MANAGE_TEAM]: Expensicons.MoneyBag,
-    [CONST.INTRO_CHOICES.CHAT_SPLIT]: Expensicons.Briefcase,
-};
-
-function PurposeForUsingExpensifyModal() {
-    const {translate} = useLocalize();
-    const StyleUtils = useStyleUtils();
-    const styles = useThemeStyles();
-    const {windowHeight} = useWindowDimensions();
-    const theme = useTheme();
-    const backgroundColorStyle = StyleUtils.getBackgroundColorStyle(theme.PAGE_THEMES[SCREENS.ONBOARD_ENGAGEMENT.ROOT].backgroundColor);
-    const appBGColor = StyleUtils.getBackgroundColorStyle(theme.appBG);
-
-    const navigateBack = useCallback(() => {
-        Report.dismissEngagementModal();
-        Navigation.goBack();
-    }, []);
-
-    const completeEngagement = useCallback((message: string, choice: ValueOf<typeof CONST.INTRO_CHOICES>) => {
-        if (choice === CONST.INTRO_CHOICES.MANAGE_TEAM) {
-            return Navigation.navigate(ROUTES.ONBOARD_MANAGE_EXPENSES);
-        }
-
-        Report.completeEngagementModal(choice, message);
-        Report.navigateToConciergeChat(true);
-    }, []);
-
-    const menuItems: MenuItemProps[] = useMemo(
-        () =>
-            Object.values(CONST.INTRO_CHOICES).map((choice) => {
-                const translationKey = `purposeForExpensify.${choice}` as const;
-                return {
-                    key: translationKey,
-                    title: translate(translationKey),
-                    icon: menuIcons[choice],
-                    iconRight: Expensicons.ArrowRight,
-                    onPress: () => completeEngagement(messageCopy[choice], choice),
-                    shouldShowRightIcon: true,
-                    numberOfLinesTitle: 2,
-                };
-            }),
-        [completeEngagement, translate],
-    );
-
-    return (
-        <ScreenWrapper
-            style={backgroundColorStyle}
-            shouldEnablePickerAvoiding={false}
-            includeSafeAreaPaddingBottom={false}
-            testID={PurposeForUsingExpensifyModal.displayName}
-        >
-            <View style={[{maxHeight: windowHeight}, styles.flex1, appBGColor]}>
-                <ScrollView>
-                    <View style={backgroundColorStyle}>
-                        <Lottie
-                            source={LottieAnimations.Hands}
-                            style={styles.w100}
-                            webStyle={styles.w100}
-                            autoPlay
-                            loop
-                        />
-                        <HeaderWithBackButton
-                            shouldShowCloseButton
-                            shouldShowBackButton={false}
-                            onCloseButtonPress={navigateBack}
-                            shouldOverlay
-                            iconFill={theme.iconColorfulBackground}
-                        />
-                    </View>
-                    <View style={[styles.w100, styles.ph5, styles.pv5]}>
-                        <Text
-                            style={[styles.textHeadline, styles.preWrap, styles.mb2]}
-                            numberOfLines={2}
-                        >
-                            {translate('purposeForExpensify.welcomeMessage')}
-                        </Text>
-                        <Text>{translate('purposeForExpensify.welcomeSubtitle')}</Text>
-                    </View>
-                    <MenuItemList
-                        menuItems={menuItems}
-                        shouldUseSingleExecution
-                    />
-                </ScrollView>
-            </View>
-        </ScreenWrapper>
-    );
-}
-
-PurposeForUsingExpensifyModal.displayName = 'PurposeForUsingExpensifyModal';
-export default PurposeForUsingExpensifyModal;
diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
index c7387c2b6aee..7049b04cc293 100644
--- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
+++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback} from 'react';
+import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -10,6 +10,7 @@ import OfflineIndicator from '@components/OfflineIndicator';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useDisableModalDismissOnEscape from '@hooks/useDisableModalDismissOnEscape';
 import useLocalize from '@hooks/useLocalize';
 import useOnboardingLayout from '@hooks/useOnboardingLayout';
@@ -34,6 +35,8 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
     const {translate} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const {shouldUseNarrowLayout} = useOnboardingLayout();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const [shouldValidateOnChange, setShouldValidateOnChange] = useState(false);
 
     useDisableModalDismissOnEscape();
 
@@ -80,6 +83,10 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
     );
 
     const validate = (values: FormOnyxValues<'onboardingPersonalDetailsForm'>) => {
+        if (!shouldValidateOnChange) {
+            setShouldValidateOnChange(true);
+        }
+
         const errors = {};
 
         // First we validate the first name field
@@ -133,16 +140,17 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                     submitButtonText={translate('common.continue')}
                     enabledWhenOffline
                     submitFlexEnabled
-                    shouldValidateOnBlur
-                    shouldValidateOnChange
+                    shouldValidateOnBlur={false}
+                    shouldValidateOnChange={shouldValidateOnChange}
                     shouldTrimValues={false}
                 >
                     <View style={[shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                        <Text style={[styles.textHeadlineH1, styles.textXXLarge]}>{translate('onboarding.whatsYourName')}</Text>
+                        <Text style={styles.textHeadlineH1}>{translate('onboarding.whatsYourName')}</Text>
                     </View>
                     <View style={styles.mb4}>
                         <InputWrapper
                             InputComponent={TextInput}
+                            ref={inputCallbackRef}
                             inputID={INPUT_IDS.FIRST_NAME}
                             name="fname"
                             label={translate('common.firstName')}
@@ -152,7 +160,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                             shouldSaveDraft
                             maxLength={CONST.DISPLAY_NAME.MAX_LENGTH}
                             spellCheck={false}
-                            autoFocus
                         />
                     </View>
                     <View>
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index 97a81af7e59d..a5222ab86c0f 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -115,7 +115,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
                     <ScrollView style={[styles.flex1, styles.flexGrow1, shouldUseNarrowLayout && styles.mt5, paddingHorizontal]}>
                         <View style={styles.flex1}>
                             <View style={[shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn, styles.mb5]}>
-                                <Text style={[styles.textHeadlineH1, styles.textXXLarge]}>{translate('onboarding.purpose.title')} </Text>
+                                <Text style={styles.textHeadlineH1}>{translate('onboarding.purpose.title')} </Text>
                             </View>
                             <MenuItemList
                                 menuItems={menuItems}
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 5eadd21f59c1..a68ff1c04d93 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -145,14 +145,6 @@ const darkTheme = {
             backgroundColor: colors.productDark200,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
-        [SCREENS.ONBOARD_ENGAGEMENT.ROOT]: {
-            backgroundColor: colors.pink800,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
-        },
-        [SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC]: {
-            backgroundColor: colors.green600,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
-        },
     },
 
     statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index d4769c62a97d..17e1c03bcdda 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -145,14 +145,6 @@ const lightTheme = {
             backgroundColor: colors.productDark200,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
-        [SCREENS.ONBOARD_ENGAGEMENT.ROOT]: {
-            backgroundColor: colors.pink800,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
-        },
-        [SCREENS.ONBOARD_ENGAGEMENT.EXPENSIFY_CLASSIC]: {
-            backgroundColor: colors.green600,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
-        },
     },
 
     statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
diff --git a/src/types/onyx/Onboarding.ts b/src/types/onyx/Onboarding.ts
new file mode 100644
index 000000000000..3559dea90450
--- /dev/null
+++ b/src/types/onyx/Onboarding.ts
@@ -0,0 +1,6 @@
+type Onboarding = {
+    /** A Boolean that informs whether the user has completed the guided setup onboarding flow */
+    hasCompletedGuidedSetupFlow: boolean;
+};
+
+export default Onboarding;