diff --git a/server/Makefile b/server/Makefile
index 79c722ffc1..7568c89eae 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -168,6 +168,7 @@ PLUGIN_PACKAGES += mattermost-plugin-jenkins-v1.1.0
 PLUGIN_PACKAGES += mattermost-plugin-jira-v3.2.5
 PLUGIN_PACKAGES += mattermost-plugin-jitsi-v2.0.1
 PLUGIN_PACKAGES += mattermost-plugin-nps-v1.3.2
+PLUGIN_PACKAGES += mattermost-plugin-servicenow-v2.3.4
 PLUGIN_PACKAGES += mattermost-plugin-todo-v0.6.1
 PLUGIN_PACKAGES += mattermost-plugin-welcomebot-v1.3.0
 PLUGIN_PACKAGES += mattermost-plugin-zoom-v1.6.0
diff --git a/webapp/channels/src/components/common/svg_images_components/servicenow_svg.tsx b/webapp/channels/src/components/common/svg_images_components/servicenow_svg.tsx
new file mode 100644
index 0000000000..8ba0c03560
--- /dev/null
+++ b/webapp/channels/src/components/common/svg_images_components/servicenow_svg.tsx
@@ -0,0 +1,22 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+
+export default () => (
+
+    <svg
+        width='41'
+        height='41'
+        viewBox='0 0 41 41'
+        fill='none'
+        xmlns='http://www.w3.org/2000/svg'
+    >
+        <path
+            fillRule='evenodd'
+            clipRule='evenodd'
+            d='M20.1337 2.5C9.05453 2.5 0 11.4255 0 22.4841C0 27.9853 2.24957 33.3182 6.2988 37.0792C7.70479 38.4265 9.89812 38.5387 11.4728 37.3599C16.5344 33.5988 23.508 33.5988 28.5696 37.3599C30.1443 38.5387 32.3376 38.4265 33.7436 37.0792C41.7858 29.4448 42.1232 16.7583 34.4747 8.731C30.7629 4.80154 25.5326 2.55614 20.1337 2.5ZM20.0212 32.5323C14.6222 32.7007 10.1231 28.4344 10.0106 23.1016C10.0106 22.9332 10.0106 22.7648 10.0106 22.5964C10.0106 17.0951 14.5097 12.6043 20.0212 12.6043C25.5326 12.6043 30.0318 17.0951 30.0318 22.5964C30.2005 27.9853 25.9263 32.42 20.5836 32.5884C20.3586 32.5323 20.1899 32.5323 20.0212 32.5323Z'
+            fill='#62D84E'
+        />
+    </svg>
+);
diff --git a/webapp/channels/src/components/common/svg_images_components/todo_svg.tsx b/webapp/channels/src/components/common/svg_images_components/todo_svg.tsx
deleted file mode 100644
index 4e5dc631fe..0000000000
--- a/webapp/channels/src/components/common/svg_images_components/todo_svg.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-
-export default () => (
-    <svg
-        width='41'
-        height='41'
-        viewBox='0 0 41 41'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-        xmlnsXlink='http://www.w3.org/1999/xlink'
-    >
-        <circle
-            cx='20.7988'
-            cy='20.002'
-            r='20'
-            fill='url(#plugin-todo)'
-        />
-        <defs>
-            <pattern
-                id='plugin-todo'
-                patternContentUnits='objectBoundingBox'
-                width='1'
-                height='1'
-            >
-                <use
-                    xlinkHref='#image0_615_81821'
-                    transform='scale(0.00195312)'
-                />
-            </pattern>
-            <image
-                id='image0_615_81821'
-                width='512'
-                height='512'
-                xlinkHref='data:image/png;base64,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'
-            />
-        </defs>
-    </svg>
-);
diff --git a/webapp/channels/src/components/preparing_workspace/plugins.tsx b/webapp/channels/src/components/preparing_workspace/plugins.tsx
index 7eeea617f5..466458ad0f 100644
--- a/webapp/channels/src/components/preparing_workspace/plugins.tsx
+++ b/webapp/channels/src/components/preparing_workspace/plugins.tsx
@@ -12,7 +12,7 @@ import GithubSVG from 'components/common/svg_images_components/github_svg';
 import GitlabSVG from 'components/common/svg_images_components/gitlab_svg';
 import JiraSVG from 'components/common/svg_images_components/jira_svg';
 import ZoomSVG from 'components/common/svg_images_components/zoom_svg';
-import TodoSVG from 'components/common/svg_images_components/todo_svg';
+import ServiceNowSVG from 'components/common/svg_images_components/servicenow_svg';
 import ExternalLink from 'components/external_link';
 
 import {Animations, mapAnimationReasonToClass, Form, PreparingWorkspacePageProps} from './steps';
@@ -133,37 +133,39 @@ const Plugins = (props: Props) => {
                                     }),
                                 },
                                 {
-                                    onClick: () => props.setOption('todo'),
-                                    icon: <TodoSVG/>,
-                                    id: t('onboarding_wizard.plugins.todo'),
-                                    defaultMessage: 'To do',
-                                    checked: props.options.todo,
+                                    onClick: () => props.setOption('servicenow'),
+                                    icon: <ServiceNowSVG/>,
+                                    id: t('onboarding_wizard.plugins.servicenow'),
+                                    defaultMessage: 'ServiceNow',
+                                    checked: props.options.servicenow,
                                     tooltip: formatMessage({
-                                        id: 'onboarding_wizard.plugins.todo.tooltip',
-                                        defaultMessage: 'To do tooltip',
+                                        id: 'onboarding_wizard.plugins.servicenow.tooltip',
+                                        defaultMessage: 'ServiceNow tooltip',
                                     }),
                                 },
                             ]}
                         />
-                        <div className='Plugins__marketplace'>
-                            <FormattedMessage
-                                id='onboarding_wizard.plugins.marketplace'
-                                defaultMessage='More tools can be added once your workspace is set up. To see all available integrations, <a>visit the Marketplace.</a>'
-                                values={{
-                                    a: (chunks: React.ReactNode | React.ReactNodeArray) => (
-                                        <strong>
-                                            <ExternalLink
-                                                href='https://mattermost.com/marketplace/'
-                                                location='preparing_workspace_plugins'
-                                                onClick={props.handleVisitMarketPlaceClick}
-                                            >
-                                                {chunks}
-                                            </ExternalLink>
-                                        </strong>
-                                    ),
-                                }}
-                            />
-                        </div>
+                        {props.isSelfHosted && (
+                            <div className='Plugins__marketplace'>
+                                <FormattedMessage
+                                    id='onboarding_wizard.plugins.marketplace'
+                                    defaultMessage='More tools can be added once your workspace is set up. To see all available integrations, <a>visit the Marketplace.</a>'
+                                    values={{
+                                        a: (chunks: React.ReactNode | React.ReactNodeArray) => (
+                                            <strong>
+                                                <ExternalLink
+                                                    href='https://mattermost.com/marketplace/'
+                                                    location='preparing_workspace_plugins'
+                                                    onClick={props.handleVisitMarketPlaceClick}
+                                                >
+                                                    {chunks}
+                                                </ExternalLink>
+                                            </strong>
+                                        ),
+                                    }}
+                                />
+                            </div>
+                        )}
                     </PageBody>
                     <div>
                         <button
diff --git a/webapp/channels/src/components/preparing_workspace/steps.ts b/webapp/channels/src/components/preparing_workspace/steps.ts
index cbb78da5b6..f4e7757a4c 100644
--- a/webapp/channels/src/components/preparing_workspace/steps.ts
+++ b/webapp/channels/src/components/preparing_workspace/steps.ts
@@ -122,7 +122,7 @@ export const PLUGIN_NAME_TO_ID_MAP: PluginNameMap = {
     gitlab: 'com.github.manland.mattermost-plugin-gitlab',
     jira: 'jira',
     zoom: 'zoom',
-    todo: 'com.mattermost.plugin-todo',
+    servicenow: 'mattermost-plugin-servicenow',
 } as const;
 
 export type Form = {
@@ -140,7 +140,7 @@ export type Form = {
         gitlab: boolean;
         jira: boolean;
         zoom: boolean;
-        todo: boolean;
+        servicenow: boolean;
 
         // set if user clicks skip for now
         skipped: boolean;
@@ -170,7 +170,7 @@ export const emptyForm = deepFreeze({
         gitlab: false,
         jira: false,
         zoom: false,
-        todo: false,
+        servicenow: false,
 
         // set if user clicks skip for now
         skipped: false,
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index e1d208bbb5..20a23335b3 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -4251,8 +4251,8 @@
   "onboarding_wizard.plugins.jira": "Jira",
   "onboarding_wizard.plugins.jira.tooltip": "Create Jira tickets from messages in Mattermost, get notified of important updates in Jira",
   "onboarding_wizard.plugins.marketplace": "More tools can be added once your workspace is set up. To see all available integrations, <a>visit the Marketplace.</a>",
-  "onboarding_wizard.plugins.todo": "To do",
-  "onboarding_wizard.plugins.todo.tooltip": "A plugin to track Todo issues in a list and send you daily reminders about your Todo list",
+  "onboarding_wizard.plugins.servicenow": "ServiceNow",
+  "onboarding_wizard.plugins.servicenow.tooltip": "This plugin serves as an integration between Mattermost and ServiceNow.",
   "onboarding_wizard.plugins.zoom": "Zoom",
   "onboarding_wizard.plugins.zoom.tooltip": "Start Zoom audio and video conferencing calls in Mattermost with a single click",
   "onboarding_wizard.previous": "Previous",