diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index d8b407d5cee9..662335d0b358 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -12,7 +12,6 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
 import Text from '@components/Text';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
@@ -119,133 +118,131 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
             icon={Illustrations.House}
         >
             {(hasVBA?: boolean) => (
-                <ScrollView>
-                    <View style={[styles.flex1, styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
-                        <Section
-                            isCentralPane
-                            title=""
-                        >
-                            <Image
-                                style={StyleSheet.flatten([styles.wAuto, styles.h68, imageStyle])}
-                                source={illustrations.WorkspaceProfile}
-                                resizeMode="cover"
-                            />
-                            <AvatarWithImagePicker
-                                onViewPhotoPress={() => Navigation.navigate(ROUTES.WORKSPACE_AVATAR.getRoute(policy?.id ?? ''))}
-                                source={policy?.avatar ?? ''}
-                                size={CONST.AVATAR_SIZE.XLARGE}
-                                avatarStyle={styles.avatarXLarge}
-                                enablePreview
-                                DefaultAvatar={DefaultAvatar}
-                                type={CONST.ICON_TYPE_WORKSPACE}
-                                fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
-                                style={[
-                                    policy?.errorFields?.avatar ?? isSmallScreenWidth ? styles.mb1 : styles.mb3,
-                                    isSmallScreenWidth ? styles.mtn17 : styles.mtn20,
-                                    styles.alignItemsStart,
-                                    styles.sectionMenuItemTopDescription,
-                                ]}
-                                editIconStyle={styles.smallEditIconWorkspace}
-                                isUsingDefaultAvatar={!policy?.avatar ?? null}
-                                onImageSelected={(file) => Policy.updateWorkspaceAvatar(policy?.id ?? '', file as File)}
-                                onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '')}
-                                editorMaskImage={Expensicons.ImageCropSquareMask}
-                                pendingAction={policy?.pendingFields?.avatar}
-                                errors={policy?.errorFields?.avatar}
-                                onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '')}
-                                previewSource={UserUtils.getFullSizeAvatar(policy?.avatar ?? '')}
-                                headerTitle={translate('workspace.common.workspaceAvatar')}
-                                originalFileName={policy?.originalFileName}
+                <View style={[styles.flex1, styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    <Section
+                        isCentralPane
+                        title=""
+                    >
+                        <Image
+                            style={StyleSheet.flatten([styles.wAuto, styles.h68, imageStyle])}
+                            source={illustrations.WorkspaceProfile}
+                            resizeMode="cover"
+                        />
+                        <AvatarWithImagePicker
+                            onViewPhotoPress={() => Navigation.navigate(ROUTES.WORKSPACE_AVATAR.getRoute(policy?.id ?? ''))}
+                            source={policy?.avatar ?? ''}
+                            size={CONST.AVATAR_SIZE.XLARGE}
+                            avatarStyle={styles.avatarXLarge}
+                            enablePreview
+                            DefaultAvatar={DefaultAvatar}
+                            type={CONST.ICON_TYPE_WORKSPACE}
+                            fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
+                            style={[
+                                policy?.errorFields?.avatar ?? isSmallScreenWidth ? styles.mb1 : styles.mb3,
+                                isSmallScreenWidth ? styles.mtn17 : styles.mtn20,
+                                styles.alignItemsStart,
+                                styles.sectionMenuItemTopDescription,
+                            ]}
+                            editIconStyle={styles.smallEditIconWorkspace}
+                            isUsingDefaultAvatar={!policy?.avatar ?? null}
+                            onImageSelected={(file) => Policy.updateWorkspaceAvatar(policy?.id ?? '', file as File)}
+                            onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '')}
+                            editorMaskImage={Expensicons.ImageCropSquareMask}
+                            pendingAction={policy?.pendingFields?.avatar}
+                            errors={policy?.errorFields?.avatar}
+                            onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '')}
+                            previewSource={UserUtils.getFullSizeAvatar(policy?.avatar ?? '')}
+                            headerTitle={translate('workspace.common.workspaceAvatar')}
+                            originalFileName={policy?.originalFileName}
+                            disabled={readOnly}
+                            disabledStyle={styles.cursorDefault}
+                            errorRowStyles={styles.mt3}
+                        />
+                        <OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
+                            <MenuItemWithTopDescription
+                                title={policyName}
+                                titleStyle={styles.workspaceTitleStyle}
+                                description={translate('workspace.editor.nameInputLabel')}
+                                shouldShowRightIcon={!readOnly}
                                 disabled={readOnly}
-                                disabledStyle={styles.cursorDefault}
-                                errorRowStyles={styles.mt3}
+                                wrapperStyle={[styles.sectionMenuItemTopDescription, isSmallScreenWidth ? styles.mt3 : {}]}
+                                onPress={onPressName}
+                                shouldGreyOutWhenDisabled={false}
+                                shouldUseDefaultCursorWhenDisabled
                             />
-                            <OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
+                        </OfflineWithFeedback>
+                        {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && (
+                            <OfflineWithFeedback
+                                pendingAction={policy?.pendingFields?.description}
+                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
+                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
+                            >
                                 <MenuItemWithTopDescription
-                                    title={policyName}
-                                    titleStyle={styles.workspaceTitleStyle}
-                                    description={translate('workspace.editor.nameInputLabel')}
+                                    title={policyDescription}
+                                    description={translate('workspace.editor.descriptionInputLabel')}
                                     shouldShowRightIcon={!readOnly}
                                     disabled={readOnly}
-                                    wrapperStyle={[styles.sectionMenuItemTopDescription, isSmallScreenWidth ? styles.mt3 : {}]}
-                                    onPress={onPressName}
+                                    wrapperStyle={styles.sectionMenuItemTopDescription}
+                                    onPress={onPressDescription}
                                     shouldGreyOutWhenDisabled={false}
                                     shouldUseDefaultCursorWhenDisabled
+                                    shouldRenderAsHTML
                                 />
                             </OfflineWithFeedback>
-                            {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && (
-                                <OfflineWithFeedback
-                                    pendingAction={policy?.pendingFields?.description}
-                                    errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
-                                    onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
-                                >
-                                    <MenuItemWithTopDescription
-                                        title={policyDescription}
-                                        description={translate('workspace.editor.descriptionInputLabel')}
-                                        shouldShowRightIcon={!readOnly}
-                                        disabled={readOnly}
-                                        wrapperStyle={styles.sectionMenuItemTopDescription}
-                                        onPress={onPressDescription}
-                                        shouldGreyOutWhenDisabled={false}
-                                        shouldUseDefaultCursorWhenDisabled
-                                        shouldRenderAsHTML
-                                    />
-                                </OfflineWithFeedback>
-                            )}
-                            <OfflineWithFeedback
-                                pendingAction={policy?.pendingFields?.generalSettings}
-                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
-                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
-                                errorRowStyles={[styles.mt2]}
-                            >
-                                <View>
-                                    <MenuItemWithTopDescription
-                                        title={formattedCurrency}
-                                        description={translate('workspace.editor.currencyInputLabel')}
-                                        shouldShowRightIcon={!readOnly}
-                                        disabled={hasVBA ? true : readOnly}
-                                        wrapperStyle={styles.sectionMenuItemTopDescription}
-                                        onPress={onPressCurrency}
-                                        shouldGreyOutWhenDisabled={false}
-                                        shouldUseDefaultCursorWhenDisabled
-                                    />
-                                    <Text style={[styles.textLabel, styles.colorMuted, styles.mt1, styles.mh5, styles.sectionMenuItemTopDescription]}>
-                                        {hasVBA ? translate('workspace.editor.currencyInputDisabledText') : translate('workspace.editor.currencyInputHelpText')}
-                                    </Text>
-                                </View>
-                            </OfflineWithFeedback>
-                            {!readOnly && (
-                                <View style={[styles.flexRow, styles.mt6, styles.mnw120]}>
-                                    <Button
-                                        accessibilityLabel={translate('common.share')}
-                                        text={translate('common.share')}
-                                        onPress={onPressShare}
-                                        medium
-                                        icon={Expensicons.QrCode}
-                                    />
-                                    <Button
-                                        accessibilityLabel={translate('common.delete')}
-                                        text={translate('common.delete')}
-                                        style={[styles.ml2]}
-                                        onPress={() => setIsDeleteModalOpen(true)}
-                                        medium
-                                        icon={Expensicons.Trashcan}
-                                    />
-                                </View>
-                            )}
-                        </Section>
-                        <ConfirmModal
-                            title={translate('common.delete')}
-                            isVisible={isDeleteModalOpen}
-                            onConfirm={confirmDeleteAndHideModal}
-                            onCancel={() => setIsDeleteModalOpen(false)}
-                            prompt={translate('workspace.common.deleteConfirmation')}
-                            confirmText={translate('common.delete')}
-                            cancelText={translate('common.cancel')}
-                            danger
-                        />
-                    </View>
-                </ScrollView>
+                        )}
+                        <OfflineWithFeedback
+                            pendingAction={policy?.pendingFields?.generalSettings}
+                            errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
+                            onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
+                            errorRowStyles={[styles.mt2]}
+                        >
+                            <View>
+                                <MenuItemWithTopDescription
+                                    title={formattedCurrency}
+                                    description={translate('workspace.editor.currencyInputLabel')}
+                                    shouldShowRightIcon={!readOnly}
+                                    disabled={hasVBA ? true : readOnly}
+                                    wrapperStyle={styles.sectionMenuItemTopDescription}
+                                    onPress={onPressCurrency}
+                                    shouldGreyOutWhenDisabled={false}
+                                    shouldUseDefaultCursorWhenDisabled
+                                />
+                                <Text style={[styles.textLabel, styles.colorMuted, styles.mt1, styles.mh5, styles.sectionMenuItemTopDescription]}>
+                                    {hasVBA ? translate('workspace.editor.currencyInputDisabledText') : translate('workspace.editor.currencyInputHelpText')}
+                                </Text>
+                            </View>
+                        </OfflineWithFeedback>
+                        {!readOnly && (
+                            <View style={[styles.flexRow, styles.mt6, styles.mnw120]}>
+                                <Button
+                                    accessibilityLabel={translate('common.share')}
+                                    text={translate('common.share')}
+                                    onPress={onPressShare}
+                                    medium
+                                    icon={Expensicons.QrCode}
+                                />
+                                <Button
+                                    accessibilityLabel={translate('common.delete')}
+                                    text={translate('common.delete')}
+                                    style={[styles.ml2]}
+                                    onPress={() => setIsDeleteModalOpen(true)}
+                                    medium
+                                    icon={Expensicons.Trashcan}
+                                />
+                            </View>
+                        )}
+                    </Section>
+                    <ConfirmModal
+                        title={translate('common.delete')}
+                        isVisible={isDeleteModalOpen}
+                        onConfirm={confirmDeleteAndHideModal}
+                        onCancel={() => setIsDeleteModalOpen(false)}
+                        prompt={translate('workspace.common.deleteConfirmation')}
+                        confirmText={translate('common.delete')}
+                        cancelText={translate('common.cancel')}
+                        danger
+                    />
+                </View>
             )}
         </WorkspacePageWithSections>
     );
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index 5bcb631c21b0..db59980a2cf4 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -1,6 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {FlatList, View} from 'react-native';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import ConfirmModal from '@components/ConfirmModal';
@@ -243,8 +243,11 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
         session?.accountID,
     ]);
 
-    const renderOptionItem = ({item}: {item: ToggleSettingOptionRowProps}) => (
-        <View style={styles.mt7}>
+    const renderOptionItem = (item: ToggleSettingOptionRowProps, index: number) => (
+        <View
+            style={styles.mt7}
+            key={`toggleSettingOptionItem-${index}`}
+        >
             <ToggleSettingOptionRow
                 icon={item.icon}
                 title={item.title}
@@ -277,6 +280,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                 shouldShowNotFoundPage={!isPaidGroupPolicy || !isPolicyAdmin}
                 shouldSkipVBBACall
                 isLoading={isLoading}
+                shouldUseScrollView
             >
                 <View style={[styles.mt3, styles.textStrong, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
@@ -286,11 +290,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                     >
                         <View>
                             <Text style={[styles.mt3, styles.textSupporting]}>{translate('workflowsPage.workflowDescription')}</Text>
-                            <FlatList
-                                data={optionItems}
-                                renderItem={renderOptionItem}
-                                keyExtractor={(item: ToggleSettingOptionRowProps) => item.title}
-                            />
+                            {optionItems.map(renderOptionItem)}
                             <ConfirmModal
                                 title={translate('workspace.bankAccount.workspaceCurrency')}
                                 isVisible={isCurrencyModalOpen}