diff --git a/.circleci/config.yml b/.circleci/config.yml
index fade0321ea29..8a1eef83b2c5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -494,10 +494,15 @@ jobs:
         command: mkdir empty-<< parameters.template >> && cd empty-<< parameters.template >>
       - run:
         name: Run storybook init
-        command: yarn storybook init 
+        command: node ../storybook/code/lib/cli/bin.js init --packageManager << parameters.packageManager >>
         environment:
-          STORYBOOK_PACKAGE_MANAGER: << parameters.packageManager >>
+          CI: true
           STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
+      - run:
+        name: Run Smoke test
+        command: node ../storybook/code/lib/cli/bin.js dev --smoke-test
+        environment:
+          CI: true
 
 workflows:
   docs:
@@ -636,45 +641,45 @@ workflows:
       - script-checks:
           requires:
             - build
-      - chromatic-internal-storybooks:
-          requires:
-            - build
-      - create-sandboxes:
-          parallelism: 36
-          requires:
-            - build
+      # - chromatic-internal-storybooks:
+      #     requires:
+      #       - build
+      # - create-sandboxes:
+      #     parallelism: 36
+      #     requires:
+      #       - build
       # - smoke-test-sandboxes: # disabled for now
       #     requires:
       #       - create-sandboxes
-      - build-sandboxes:
-          parallelism: 36
-          requires:
-            - create-sandboxes
-      - chromatic-sandboxes:
-          parallelism: 33
-          requires:
-            - build-sandboxes
-      - e2e-production:
-          parallelism: 31
-          requires:
-            - build-sandboxes
-      - e2e-dev:
-          parallelism: 2
-          requires:
-            - create-sandboxes
-      - test-runner-production:
-          parallelism: 31
-          requires:
-            - build-sandboxes
-      # TODO: Uncomment when ready to test
-      # - test-empty-init:
-      #     parallelism: 15
+      # - build-sandboxes:
+      #     parallelism: 36
       #     requires:
-      #       - build
-      #     matrix:
-      #       parameters:
-      #         packageManager: [yarn2],
-      #         template: ["react-vite-ts", "nextjs-ts", "vue-vite-ts", "angular-cli", "lit-vite-ts"]
+      #       - create-sandboxes
+      # - chromatic-sandboxes:
+      #     parallelism: 33
+      #     requires:
+      #       - build-sandboxes
+      # - e2e-production:
+      #     parallelism: 31
+      #     requires:
+      #       - build-sandboxes
+      # - e2e-dev:
+      #     parallelism: 2
+      #     requires:
+      #       - create-sandboxes
+      # - test-runner-production:
+      #     parallelism: 31
+      #     requires:
+      #       - build-sandboxes
+      # TODO: Uncomment when ready to test
+      - test-empty-init:
+          parallelism: 5
+          requires:
+            - build
+          matrix:
+            parameters:
+              packageManager: [yarn2],
+              template: ["react-vite-ts", "nextjs-ts", "vue-vite-ts", "angular-cli", "lit-vite-ts"]
   
       # TODO: reenable once we find out the source of flakyness
       # - test-runner-dev:
diff --git a/code/lib/cli/src/generate.ts b/code/lib/cli/src/generate.ts
index 07620c9ee1e2..bc396ec428b7 100644
--- a/code/lib/cli/src/generate.ts
+++ b/code/lib/cli/src/generate.ts
@@ -47,11 +47,7 @@ command('init')
   .description('Initialize Storybook into your project.')
   .option('-f --force', 'Force add Storybook')
   .option('-s --skip-install', 'Skip installing deps')
-  .option(
-    '--package-manager <npm|pnpm|yarn1|yarn2>',
-    'Force package manager for installing deps',
-    process.env.STORYBOOK_PACKAGE_MANAGER
-  )
+  .option('--package-manager <npm|pnpm|yarn1|yarn2>', 'Force package manager for installing deps')
   .option('-N --use-npm', 'Use npm to install deps (deprecated)')
   .option('--use-pnp', 'Enable pnp mode for Yarn 2+')
   .option('-p --parser <babel | babylon | flow | ts | tsx>', 'jscodeshift parser')