diff --git a/.changeset/sour-trainers-talk.md b/.changeset/sour-trainers-talk.md
new file mode 100644
index 00000000..6990db33
--- /dev/null
+++ b/.changeset/sour-trainers-talk.md
@@ -0,0 +1,31 @@
+---
+'@jpmorganchase/mosaic-cli': patch
+'@jpmorganchase/mosaic-components': patch
+'@jpmorganchase/mosaic-labs-components': patch
+'@jpmorganchase/mosaic-content-editor-plugin': patch
+'@jpmorganchase/mosaic-core': patch
+'@jpmorganchase/mosaic-create-site': patch
+'@jpmorganchase/mosaic-from-http-request': patch
+'@jpmorganchase/mosaic-layouts': patch
+'@jpmorganchase/mosaic-open-api-component': patch
+'@jpmorganchase/mosaic-plugins': patch
+'@jpmorganchase/mosaic-schemas': patch
+'@jpmorganchase/mosaic-serialisers': patch
+'@jpmorganchase/mosaic-site': patch
+'@jpmorganchase/mosaic-site-components': patch
+'@jpmorganchase/mosaic-site-middleware': patch
+'@jpmorganchase/mosaic-site-preset-styles': patch
+'@jpmorganchase/mosaic-source-figma': patch
+'@jpmorganchase/mosaic-source-git-repo': patch
+'@jpmorganchase/mosaic-source-http': patch
+'@jpmorganchase/mosaic-source-local-folder': patch
+'@jpmorganchase/mosaic-source-readme': patch
+'@jpmorganchase/mosaic-source-storybook': patch
+'@jpmorganchase/mosaic-standard-generator': patch
+'@jpmorganchase/mosaic-store': patch
+'@jpmorganchase/mosaic-theme': patch
+'@jpmorganchase/mosaic-types': patch
+'@jpmorganchase/mosaic-workflows': patch
+---
+
+add `pluginTimeout` (20 secs) to fastify to prevent loading timeout
diff --git a/packages/cli/src/serve.ts b/packages/cli/src/serve.ts
index 35445f18..aa8f3645 100644
--- a/packages/cli/src/serve.ts
+++ b/packages/cli/src/serve.ts
@@ -10,7 +10,8 @@ import fastifyMosaicWorkflows from './plugins/mosaicWorkflowsPlugin.js';
 const MOSAIC_ADMIN_PREFIX = '_mosaic_';
 
 export const server = Fastify({
-  logger: false
+  logger: false,
+  pluginTimeout: 20000
 });
 
 export default async function serve(config: MosaicConfig, port: number, scope?: string[]) {
diff --git a/yarn.lock b/yarn.lock
index 8cbaad8b..279ad4cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1820,21 +1820,6 @@
     human-id "^1.0.2"
     prettier "^2.7.1"
 
-"@dpmosaic/mosaic-internal-components@^0.6.2":
-  version "0.6.2"
-  resolved "https://artifacts.jpmchase.net/artifactory/api/npm/npm/@dpmosaic/mosaic-internal-components/-/@dpmosaic/mosaic-internal-components-0.6.2.tgz#9fe8df72cdef24912cae041dd4ab7d149b8a240a"
-  integrity sha1-n+jfcs3vJJEsrgQd1Kt9FJuKJAo=
-  dependencies:
-    "@jpmorganchase/mosaic-components" "^0.1.0-beta.57"
-    "@jpmorganchase/mosaic-store" "^0.1.0-beta.57"
-    "@jpmorganchase/mosaic-theme" "^0.1.0-beta.57"
-    "@salt-ds/core" "^1.11.0"
-    "@salt-ds/lab" "1.0.0-alpha.20"
-    "@vanilla-extract/css" "^1.6.0"
-    "@vanilla-extract/recipes" "^0.2.1"
-    "@vanilla-extract/sprinkles" "^1.3.0"
-    clsx "^2.0.0"
-
 "@emotion/babel-plugin@^11.10.5":
   version "11.10.5"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c"