diff --git a/src/CONST.ts b/src/CONST.ts
index c32248e6dcf3..051fe789751d 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -274,6 +274,7 @@ type OnboardingTask = {
                   workspaceMembersLink: string;
                   integrationName: string;
                   workspaceAccountingLink: string;
+                  workspaceSettingsLink: string;
                   navatticURL: string;
               }>,
           ) => string);
@@ -4911,6 +4912,15 @@ const CONST = {
                         '\n' +
                         `Chat with the specialist in your [#admins room](${adminsRoomLink}).`,
                 },
+                {
+                    type: 'setupCategoriesAndTags',
+                    autoCompleted: false,
+                    title: 'Set up categories and tags',
+                    description: ({workspaceSettingsLink, workspaceAccountingLink}) =>
+                        '*Set up categories and tags* so your team can code expenses for easy reporting.\n' +
+                        '\n' +
+                        `Import them automatically by [connecting your accounting software](${workspaceAccountingLink}), or set them up manually in your [workspace settings](${workspaceSettingsLink}).`,
+                },
                 {
                     type: 'setupCategories',
                     autoCompleted: false,
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index ec87dcb16df8..dde930b522a5 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -3528,7 +3528,11 @@ function prepareOnboardingOptimisticData(
     }
     const tasksData = data.tasks
         .filter((task) => {
-            if (task.type === 'addAccountingIntegration' && !userReportedIntegration) {
+            if (['setupCategories', 'setupTags'].includes(task.type) && userReportedIntegration) {
+                return false;
+            }
+
+            if (['addAccountingIntegration', 'setupCategoriesAndTags'].includes(task.type) && !userReportedIntegration) {
                 return false;
             }
             return true;
@@ -3544,6 +3548,7 @@ function prepareOnboardingOptimisticData(
                           navatticURL: getNavatticURL(environment, engagementChoice),
                           integrationName,
                           workspaceAccountingLink: `${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(onboardingPolicyID ?? '-1')}`,
+                          workspaceSettingsLink: `${environmentURL}/${ROUTES.WORKSPACE_INITIAL.getRoute(onboardingPolicyID ?? '-1')}`,
                       })
                     : task.description;
             const taskTitle =