diff --git a/.circleci/config.yml b/.circleci/config.yml
index b384479d14ed..18ad245f250b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -195,13 +195,13 @@ jobs:
           name: running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: Run E2E (extended) tests
           command: |
@@ -225,13 +225,13 @@ jobs:
           name: Running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: Run E2E (core) tests
           # Do not test CRA here because it's done in PnP part
@@ -265,11 +265,11 @@ jobs:
   #         at: .
   #     - run:
   #         name: Running local registry
-  #         command: yarn local-registry --port 6000 --open
+  #         command: yarn local-registry --port 6001 --open
   #         background: true
   #     - run:
   #         name: Wait for registry
-  #         command: yarn wait-on http://localhost:6000
+  #         command: yarn wait-on http://localhost:6001
   #     - run:
   #         name: Run smoke tests
   #         command: yarn test:e2e-framework angular_modern_inline_rendering --test-runner --docs-mode
@@ -293,13 +293,13 @@ jobs:
           name: Running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: set up cra repro, skip tests
           command: |
@@ -324,13 +324,13 @@ jobs:
           name: Running local registry
           command: |
             cd code
-            yarn local-registry --port 6000 --open
+            yarn local-registry --port 6001 --open
           background: true
       - run:
           name: Wait for registry
           command: |
             cd code
-            yarn wait-on http://localhost:6000
+            yarn wait-on http://localhost:6001
       - run:
           name: run e2e tests cra
           command: |
diff --git a/code/lib/cli/src/js-package-manager/JsPackageManager.ts b/code/lib/cli/src/js-package-manager/JsPackageManager.ts
index 4f7e553a5dea..46414f43b483 100644
--- a/code/lib/cli/src/js-package-manager/JsPackageManager.ts
+++ b/code/lib/cli/src/js-package-manager/JsPackageManager.ts
@@ -39,9 +39,20 @@ export abstract class JsPackageManager {
 
   public abstract getRunCommand(command: string): string;
 
-  public abstract setRegistryURL(url: string): void;
+  // NOTE: for some reason yarn prefers the npm registry in
+  // local development, so always use npm
+  setRegistryURL(url: string) {
+    if (url) {
+      this.executeCommand('npm', ['config', 'set', 'registry', url]);
+    } else {
+      this.executeCommand('npm', ['config', 'delete', 'registry']);
+    }
+  }
 
-  public abstract getRegistryURL(): string;
+  getRegistryURL() {
+    const url = this.executeCommand('npm', ['config', 'get', 'registry']).trim();
+    return url === 'undefined' ? undefined : url;
+  }
 
   public readonly cwd?: string;
 
diff --git a/code/lib/cli/src/js-package-manager/NPMProxy.ts b/code/lib/cli/src/js-package-manager/NPMProxy.ts
index 64edffa7a6b7..d89726f9d7dc 100644
--- a/code/lib/cli/src/js-package-manager/NPMProxy.ts
+++ b/code/lib/cli/src/js-package-manager/NPMProxy.ts
@@ -61,19 +61,6 @@ export class NPMProxy extends JsPackageManager {
     return this.uninstallArgs;
   }
 
-  setRegistryURL(url: string) {
-    if (url) {
-      this.executeCommand('npm', ['config', 'set', 'registry', url]);
-    } else {
-      this.executeCommand('npm', ['config', 'delete', 'registry']);
-    }
-  }
-
-  getRegistryURL() {
-    const url = this.executeCommand('npm', ['config', 'get', 'registry']).trim();
-    return url === 'undefined' ? undefined : url;
-  }
-
   protected getResolutions(packageJson: PackageJson, versions: Record<string, string>) {
     return {
       overrides: {
diff --git a/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts b/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts
index 90a7df8b9b8c..c9087095df63 100644
--- a/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts
+++ b/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts
@@ -27,10 +27,10 @@ describe('Yarn 1 Proxy', () => {
 
       yarn1Proxy.setRegistryURL('https://foo.bar');
 
-      expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [
+      expect(executeCommandSpy).toHaveBeenCalledWith('npm', [
         'config',
         'set',
-        'npmRegistryServer',
+        'registry',
         'https://foo.bar',
       ]);
     });
diff --git a/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts b/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts
index bcb0c01ae213..789499084c85 100644
--- a/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts
+++ b/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts
@@ -16,19 +16,6 @@ export class Yarn1Proxy extends JsPackageManager {
     return `yarn ${command}`;
   }
 
-  setRegistryURL(url: string) {
-    if (url) {
-      this.executeCommand('yarn', ['config', 'set', 'npmRegistryServer', url]);
-    } else {
-      this.executeCommand('yarn', ['config', 'delete', 'npmRegistryServer']);
-    }
-  }
-
-  getRegistryURL() {
-    const url = this.executeCommand('yarn', ['config', 'get', 'npmRegistryServer']).trim();
-    return url === 'undefined' ? undefined : url;
-  }
-
   protected getResolutions(packageJson: PackageJson, versions: Record<string, string>) {
     return {
       resolutions: {
diff --git a/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts b/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts
index 93faad9aa82e..561c957257da 100644
--- a/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts
+++ b/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts
@@ -37,10 +37,10 @@ describe('Yarn 2 Proxy', () => {
 
       yarn2Proxy.setRegistryURL('https://foo.bar');
 
-      expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [
+      expect(executeCommandSpy).toHaveBeenCalledWith('npm', [
         'config',
         'set',
-        'npmRegistryServer',
+        'registry',
         'https://foo.bar',
       ]);
     });
diff --git a/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts b/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts
index 4ab59b903d4b..63736283424f 100644
--- a/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts
+++ b/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts
@@ -16,19 +16,6 @@ export class Yarn2Proxy extends JsPackageManager {
     return `yarn ${command}`;
   }
 
-  setRegistryURL(url: string) {
-    if (url) {
-      this.executeCommand('yarn', ['config', 'set', 'npmRegistryServer', url]);
-    } else {
-      this.executeCommand('yarn', ['config', 'delete', 'npmRegistryServer']);
-    }
-  }
-
-  getRegistryURL() {
-    const url = this.executeCommand('yarn', ['config', 'get', 'npmRegistryServer']).trim();
-    return url === 'undefined' ? undefined : url;
-  }
-
   protected getResolutions(packageJson: PackageJson, versions: Record<string, string>) {
     return {
       resolutions: {
diff --git a/code/lib/cli/src/repro-generators/scripts.ts b/code/lib/cli/src/repro-generators/scripts.ts
index 1558be57817c..e08687688109 100644
--- a/code/lib/cli/src/repro-generators/scripts.ts
+++ b/code/lib/cli/src/repro-generators/scripts.ts
@@ -144,7 +144,7 @@ const installYarn2 = async ({ cwd, pnp, name }: Options) => {
 const configureYarn2ForE2E = async ({ cwd }: Options) => {
   const command = [
     // ⚠️ Need to set registry because Yarn 2 is not using the conf of Yarn 1 (URL is hardcoded in CircleCI config.yml)
-    `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`,
+    `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6001/" } }'`,
     // Some required magic to be able to fetch deps from local registry
     `yarn config set unsafeHttpWhitelist --json '["localhost"]'`,
     // Disable fallback mode to make sure everything is required correctly
diff --git a/code/package.json b/code/package.json
index 3a07e408d349..ae2104a80a9d 100644
--- a/code/package.json
+++ b/code/package.json
@@ -59,7 +59,6 @@
     "changelog": "pr-log --sloppy --cherry-pick",
     "changelog:next": "pr-log --sloppy --since-prerelease",
     "check": "NODE_ENV=production node ../scripts/check-package.js",
-    "clean:dist": "del **/dist",
     "coverage": "codecov",
     "create-built-sandboxes-index": "ts-node ../scripts/create-built-sandboxes-index",
     "danger": "danger",
@@ -75,7 +74,7 @@
     "lint:md": "remark -q .",
     "lint:other": "prettier --write '**/*.{css,html,json,md,yml}'",
     "lint:package": "sort-package-json",
-    "local-registry": "ts-node --project=../scripts/tsconfig.json ../scripts/run-registry.ts --port 6000",
+    "local-registry": "ts-node --project=../scripts/tsconfig.json ../scripts/run-registry.ts --port 6001",
     "publish-repros": "ts-node ../scripts/next-repro-generators/publish.ts",
     "publish:debug": "npm run publish:latest -- --npm-tag=debug --no-push",
     "publish:latest": "lerna publish --exact --concurrency 1 --force-publish",
@@ -276,7 +275,6 @@
     "core-js": "^3.21.1",
     "cross-env": "^7.0.3",
     "danger": "^10.6.2",
-    "del-cli": "^4.0.1",
     "detect-port": "^1.3.0",
     "dts-bundle-generator": "^6.2.0",
     "ejs-lint": "^1.2.2",
diff --git a/code/yarn.lock b/code/yarn.lock
index dbe50caa9955..76e37da4c9d9 100644
--- a/code/yarn.lock
+++ b/code/yarn.lock
@@ -9014,7 +9014,6 @@ __metadata:
     cross-env: ^7.0.3
     cypress: 8.7.0
     danger: ^10.6.2
-    del-cli: ^4.0.1
     detect-port: ^1.3.0
     dts-bundle-generator: ^6.2.0
     ejs-lint: ^1.2.2
@@ -15633,18 +15632,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase-keys@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "camelcase-keys@npm:7.0.2"
-  dependencies:
-    camelcase: ^6.3.0
-    map-obj: ^4.1.0
-    quick-lru: ^5.1.1
-    type-fest: ^1.2.1
-  checksum: ae86a51168643e9e8a2f2c7bfa17850729979ec3dafc5253056a7d97931cbb0e3ef5b4185e59d54b7a56c54405dee2874b0c82033498d8626e512ff9034cb05c
-  languageName: node
-  linkType: hard
-
 "camelcase@npm:^2.0.0":
   version: 2.1.1
   resolution: "camelcase@npm:2.1.1"
@@ -15666,7 +15653,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0, camelcase@npm:^6.2.1, camelcase@npm:^6.3.0":
+"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0, camelcase@npm:^6.2.1":
   version: 6.3.0
   resolution: "camelcase@npm:6.3.0"
   checksum: 0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
@@ -18202,13 +18189,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decamelize@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "decamelize@npm:5.0.1"
-  checksum: 3da71022bc1e85487810fa0833138effb599fa331ca21e179650e93a765d0c4dabeb1ecdd6ad1474fa0bacd2457953c63ea335afb6e53b35f2b4bf779514e2a3
-  languageName: node
-  linkType: hard
-
 "decimal.js@npm:^10.2.1, decimal.js@npm:^10.3.1":
   version: 10.3.1
   resolution: "decimal.js@npm:10.3.1"
@@ -18482,19 +18462,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"del-cli@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "del-cli@npm:4.0.1"
-  dependencies:
-    del: ^6.0.0
-    meow: ^10.1.0
-  bin:
-    del: cli.js
-    del-cli: cli.js
-  checksum: 01d314de214e7d96159f99d385186d90a71e0494a9262d98b8da15d144a22b894e0fae4d99d7c707cf3a50990f0513263c0e5b5b72ce5ad92f1ab1c7140e0f70
-  languageName: node
-  linkType: hard
-
 "del@npm:^2.2.0":
   version: 2.2.2
   resolution: "del@npm:2.2.2"
@@ -25373,13 +25340,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"indent-string@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "indent-string@npm:5.0.0"
-  checksum: 8ee77b57d92e71745e133f6f444d6fa3ed503ad0e1bcd7e80c8da08b42375c07117128d670589725ed07b1978065803fa86318c309ba45415b7fe13e7f170220
-  languageName: node
-  linkType: hard
-
 "infer-owner@npm:^1.0.3, infer-owner@npm:^1.0.4":
   version: 1.0.4
   resolution: "infer-owner@npm:1.0.4"
@@ -30285,7 +30245,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-obj@npm:^4.0.0, map-obj@npm:^4.1.0":
+"map-obj@npm:^4.0.0":
   version: 4.3.0
   resolution: "map-obj@npm:4.3.0"
   checksum: 1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b
@@ -30841,26 +30801,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meow@npm:^10.1.0":
-  version: 10.1.3
-  resolution: "meow@npm:10.1.3"
-  dependencies:
-    "@types/minimist": ^1.2.2
-    camelcase-keys: ^7.0.0
-    decamelize: ^5.0.0
-    decamelize-keys: ^1.1.0
-    hard-rejection: ^2.1.0
-    minimist-options: 4.1.0
-    normalize-package-data: ^3.0.2
-    read-pkg-up: ^8.0.0
-    redent: ^4.0.0
-    trim-newlines: ^4.0.2
-    type-fest: ^1.2.2
-    yargs-parser: ^20.2.9
-  checksum: 83370487875a4280268fcffc0d979ce4f90c1c020c6f5523890a5aae363712c00e1f692a81a625b289801a1555f8a2a7101521af498ef89de575aab53c54ef24
-  languageName: node
-  linkType: hard
-
 "meow@npm:^3.3.0":
   version: 3.7.0
   resolution: "meow@npm:3.7.0"
@@ -31520,7 +31460,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"min-indent@npm:^1.0.0, min-indent@npm:^1.0.1":
+"min-indent@npm:^1.0.0":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
   checksum: 7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c
@@ -32702,7 +32642,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2":
+"normalize-package-data@npm:^3.0.0":
   version: 3.0.3
   resolution: "normalize-package-data@npm:3.0.3"
   dependencies:
@@ -37374,17 +37314,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "read-pkg-up@npm:8.0.0"
-  dependencies:
-    find-up: ^5.0.0
-    read-pkg: ^6.0.0
-    type-fest: ^1.0.1
-  checksum: cf3905ccbe5cd602f23192cc7ca65ed17561bab117eadb9aed817441d5bfc6b9a11215c2a3e9505f501d046818f3c4180dbea61fa83c42083e0b4e407d5cc745
-  languageName: node
-  linkType: hard
-
 "read-pkg@npm:^1.0.0":
   version: 1.1.0
   resolution: "read-pkg@npm:1.1.0"
@@ -37430,18 +37359,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "read-pkg@npm:6.0.0"
-  dependencies:
-    "@types/normalize-package-data": ^2.4.0
-    normalize-package-data: ^3.0.2
-    parse-json: ^5.2.0
-    type-fest: ^1.0.1
-  checksum: b51ee5eed75324f4fac34c9a40b5e4b403de4c532242be01959c9bbdb1ff9db1c6c2aefaba569622fec49d1ead866e97ba856ab145f6e11039b11f7bec1318ba
-  languageName: node
-  linkType: hard
-
 "read@npm:1, read@npm:~1.0.1":
   version: 1.0.7
   resolution: "read@npm:1.0.7"
@@ -37652,16 +37569,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"redent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "redent@npm:4.0.0"
-  dependencies:
-    indent-string: ^5.0.0
-    strip-indent: ^4.0.0
-  checksum: a9b640c8f4b2b5b26a1a908706475ff404dd50a97d6f094bc3c59717be922622927cc7d601d4ae2857d897ad243fd979bd76d751a0481cee8be7024e5fb4c662
-  languageName: node
-  linkType: hard
-
 "redeyed@npm:~1.0.0":
   version: 1.0.1
   resolution: "redeyed@npm:1.0.1"
@@ -41185,15 +41092,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-indent@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "strip-indent@npm:4.0.0"
-  dependencies:
-    min-indent: ^1.0.1
-  checksum: 6b1fb4e22056867f5c9e7a6f3f45922d9a2436cac758607d58aeaac0d3b16ec40b1c43317de7900f1b8dd7a4107352fa47fb960f2c23566538c51e8585c8870e
-  languageName: node
-  linkType: hard
-
 "strip-json-comments@npm:^2.0.0, strip-json-comments@npm:~2.0.1":
   version: 2.0.1
   resolution: "strip-json-comments@npm:2.0.1"
@@ -42674,13 +42572,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"trim-newlines@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "trim-newlines@npm:4.0.2"
-  checksum: 48d022e9d14f27cf8b71983691af61cd8ce511d159ed0962452d2fa23f58298398d905e1ff982566f9034f93df3ef676868c1c14d13bcd849e7500dbfbd6101b
-  languageName: node
-  linkType: hard
-
 "trim-repeated@npm:^1.0.0":
   version: 1.0.0
   resolution: "trim-repeated@npm:1.0.0"
@@ -43103,13 +42994,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2":
-  version: 1.4.0
-  resolution: "type-fest@npm:1.4.0"
-  checksum: a3c0f4ee28ff6ddf800d769eafafcdeab32efa38763c1a1b8daeae681920f6e345d7920bf277245235561d8117dab765cb5f829c76b713b4c9de0998a5397141
-  languageName: node
-  linkType: hard
-
 "type-fest@npm:^2.17.0":
   version: 2.17.0
   resolution: "type-fest@npm:2.17.0"
diff --git a/docs/contribute/code.md b/docs/contribute/code.md
index 0aca843f604c..a6c596d709e0 100644
--- a/docs/contribute/code.md
+++ b/docs/contribute/code.md
@@ -101,7 +101,7 @@ Unit tests ensure that Storybook doesn't break accidentally. If your code can re
 Storybook's monorepo is set up to rely on end-to-end testing with [Cypress](https://www.cypress.io/) during CI. To help with testing, we encourage running this test suite before submitting your contribution. Detailed below are some steps you can take:
 
 1. Ensure you have Storybook successfully built in your local branch (i.e., run `yarn bootstrap --core`)
-2. Open a terminal and run `yarn local-registry --port 6000 --open --publish` to publish Storybook's packages into a local registry.
+2. Open a terminal and run `yarn local-registry --port 6001 --open --publish` to publish Storybook's packages into a local registry.
 3. In a second terminal, set up a reproduction using the local registry and run the Cypress tests with `yarn test:e2e-framework`.
 
 ## Submit a pull request
diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
index 0ebde0341041..4fc16a11063d 100755
--- a/scripts/bootstrap.js
+++ b/scripts/bootstrap.js
@@ -95,15 +95,6 @@ function run() {
       },
       order: 1,
     }),
-    cleanup: createTask({
-      name: `Remove compiled dist directories ${chalk.gray('(cleanup)')}`,
-      defaultValue: false,
-      option: '--cleanup',
-      command: () => {
-        spawn('npm run clean:dist');
-      },
-      order: 0,
-    }),
     reset: createTask({
       name: `Clean repository ${chalk.red('(reset)')}`,
       defaultValue: false,
@@ -143,7 +134,7 @@ function run() {
       defaultValue: false,
       option: '--reg',
       command: () => {
-        spawn('yarn local-registry --publish --open --port 6000');
+        spawn('yarn local-registry --publish --open --port 6001');
       },
       order: 11,
     }),
@@ -161,7 +152,7 @@ function run() {
   const groups = {
     main: ['prep', 'core'],
     buildtasks: ['install', 'build'],
-    devtasks: ['dev', 'registry', 'cleanup', 'reset'],
+    devtasks: ['dev', 'registry', 'reset'],
   };
 
   Object.keys(tasks)
diff --git a/scripts/build-package.js b/scripts/build-package.js
index f9df57b1f7c2..70468be2e0ea 100644
--- a/scripts/build-package.js
+++ b/scripts/build-package.js
@@ -113,7 +113,7 @@ async function run() {
   }
 
   selection?.filter(Boolean).forEach(async (v) => {
-    const commmand = (await readJSON(resolve(v.location, 'package.json'))).scripts.prepare;
+    const commmand = (await readJSON(resolve(v.location, 'package.json'))).scripts.prep;
     const cwd = resolve(__dirname, '..', 'code', v.location);
     const sub = require('execa').command(
       `${commmand}${watchMode ? ' --watch' : ''}${prodMode ? ' --optimized' : ''}`,
diff --git a/scripts/next-repro-generators/generate-repros.ts b/scripts/next-repro-generators/generate-repros.ts
index d22b0728cc9d..89c3d66df9c5 100755
--- a/scripts/next-repro-generators/generate-repros.ts
+++ b/scripts/next-repro-generators/generate-repros.ts
@@ -29,7 +29,7 @@ const sbInit = async (cwd: string) => {
   await runCommand(`${sbCliBinaryPath} init --yes`, { cwd, env });
 };
 
-const LOCAL_REGISTRY_URL = 'http://localhost:6000';
+const LOCAL_REGISTRY_URL = 'http://localhost:6001';
 const withLocalRegistry = async (packageManager: JsPackageManager, action: () => Promise<void>) => {
   const prevUrl = packageManager.getRegistryURL();
   try {
diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts
index 8e629914fbf4..e25504aeb0c1 100644
--- a/scripts/run-e2e.ts
+++ b/scripts/run-e2e.ts
@@ -163,7 +163,7 @@ const runTests = async ({ name, ...rest }: Parameters) => {
       targetFolder,
       `--renderer ${options.renderer}`,
       `--template ${options.name}`,
-      `--registry http://localhost:6000`,
+      `--registry http://localhost:6001`,
       '--e2e',
     ];
 
diff --git a/scripts/run-registry.ts b/scripts/run-registry.ts
index 44cf43c8b86f..4837e5fa1112 100755
--- a/scripts/run-registry.ts
+++ b/scripts/run-registry.ts
@@ -43,7 +43,7 @@ const startVerdaccio = (port: number): Promise<any> => {
         });
       };
 
-      startVerdaccioServer(config, 6000, cache, '1.0.0', 'verdaccio', onReady);
+      startVerdaccioServer(config, 6001, cache, '1.0.0', 'verdaccio', onReady);
     }),
     new Promise((_, rej) => {
       setTimeout(() => {
diff --git a/scripts/utils/serve-packages.ts b/scripts/utils/serve-packages.ts
index cba7ae8f98f5..58dd5adc9986 100644
--- a/scripts/utils/serve-packages.ts
+++ b/scripts/utils/serve-packages.ts
@@ -14,7 +14,7 @@ export async function servePackages({ dryRun, debug }: { dryRun?: boolean; debug
     // If aborted, we want to make sure the rejection is handled.
     if (!err.killed) throw err;
   });
-  await exec('yarn wait-on http://localhost:6000', { cwd: codeDir }, { dryRun, debug });
+  await exec('yarn wait-on http://localhost:6001', { cwd: codeDir }, { dryRun, debug });
 
   return controller;
 }
diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts
index fc8f95732bcf..948fd77acfb4 100644
--- a/scripts/utils/yarn.ts
+++ b/scripts/utils/yarn.ts
@@ -50,7 +50,7 @@ export const configureYarn2ForVerdaccio = async ({ cwd, dryRun, debug }: YarnOpt
     `yarn config set enableGlobalCache false`,
     `yarn config set enableMirror false`,
     // ⚠️ Need to set registry because Yarn 2 is not using the conf of Yarn 1 (URL is hardcoded in CircleCI config.yml)
-    `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`,
+    `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6001/" } }'`,
     // Some required magic to be able to fetch deps from local registry
     `yarn config set unsafeHttpWhitelist --json '["localhost"]'`,
     // Disable fallback mode to make sure everything is required correctly