diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index f1a57497ccb..0c61b69b4c9 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-          buildScriptName: 'build:storybook'
+          buildScriptName: 'build:sb'
           skip: 'dependabot/**'
         env:
           STORYBOOK_ENV: chromatic
diff --git a/.github/workflows/docs-stable.yml b/.github/workflows/docs-stable.yml
index ca18e959a24..f93a6a6b8ec 100644
--- a/.github/workflows/docs-stable.yml
+++ b/.github/workflows/docs-stable.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Build Storybook
         run: |
-          yarn build:storybook
+          yarn build:sb-with-search
           yarn build:storybook-sitemap --basePath "v${{ env.MAJOR_VERSION }}"
         env:
           NODE_OPTIONS: '--max-old-space-size=4096'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 30f276ab7ce..db60c3dc575 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,7 +80,7 @@ jobs:
       - name: Install and Build
         run: |
           yarn install --immutable
-          yarn build:storybook
+          yarn build:sb-with-search
         env:
           NODE_OPTIONS: '--max-old-space-size=4096'
 
diff --git a/package.json b/package.json
index d9a1bdd1257..ce3ceffc872 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,9 @@
     "start:storybook": "storybook dev -p 6006",
     "setup": "lerna run build:i18n && lerna run build:css && lerna run build:css-bundle && lerna run build:version-info && rimraf node_modules/@types/mocha",
     "build": "yarn setup && tsc --build tsconfig.build.json && lerna run build:client && lerna run build:wrapper",
-    "build:storybook": "yarn build && yarn create-cypress-commands-docs && storybook build -o .out && node --experimental-strip-types ./scripts/storybook-search/build-index.ts --directory .out",
+    "build:sb": "yarn build && yarn create-cypress-commands-docs && storybook build -o .out",
+    "build:sb-search-index": "node --experimental-strip-types ./scripts/storybook-search/build-index.ts --directory .out",
+    "build:sb-with-search": "yarn build:sb && yarn build:sb-search-index",
     "build:storybook-sitemap": "node ./scripts/create-storybook-sitemap.js --directory .out",
     "test:prepare": "rimraf temp && lerna run build",
     "test:open": "CYPRESS_COVERAGE=false cypress open --component --browser chrome",
@@ -31,7 +33,7 @@
     "create-webcomponents-wrapper": "(cd packages/cli && tsc) && yarn run wrappers:main && yarn run wrappers:fiori && prettier --log-level silent --write ./packages/main/src/webComponents && eslint --fix ./packages/main/src/webComponents/*/index.tsx && yarn run sb:prepare-cem",
     "create-webcomponents-wrapper-compat": "(cd packages/cli && tsc) && yarn run wrappers:compat && yarn run sb:prepare-cem && eslint --fix ./packages/compat/src/components/*/index.tsx",
     "create-webcomponents-wrapper-ai": "(cd packages/cli && tsc) && yarn run wrappers:ai && yarn run sb:prepare-cem && eslint --fix ./packages/ai/src/components/*/index.tsx",
-    "chromatic": "cross-env STORYBOOK_ENV=chromatic npx chromatic --build-script-name build:storybook",
+    "chromatic": "cross-env STORYBOOK_ENV=chromatic npx chromatic --build-script-name build:sb",
     "postinstall": "husky && yarn setup",
     "create-cypress-commands-docs": "documentation build ./packages/cypress-commands/src/commands.ts -f json -o ./packages/cypress-commands/api-commands.json && documentation build ./packages/cypress-commands/src/queries.ts -f json -o ./packages/cypress-commands/api-queries.json",
     "sb:prepare-cem": "node packages/cli/dist/bin/index.js resolve-cem --packageName @ui5/webcomponents --out ./.storybook/custom-element-manifests/main.json && node packages/cli/dist/bin/index.js resolve-cem --packageName @ui5/webcomponents-fiori --out ./.storybook/custom-element-manifests/fiori.json && node packages/cli/dist/bin/index.js resolve-cem --packageName @ui5/webcomponents-ai --out ./.storybook/custom-element-manifests/ai.json",