diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2c13b92807e..2510a422489 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -506,19 +506,14 @@ jobs:
           at: .
       - run:
           name: Building Sandboxes
-          command: yarn build-sandboxes --cadence ci --junit test-results/build.xml
-          working_directory: code
-      - run:
-          name: Build index.html
-          command: yarn create-built-sandboxes-index --cadence ci --output "../built-sandboxes"
-          background: true
+          command: yarn task --task build --template $(yarn get-template ci) --force --no-before --junit
           working_directory: code
       - store_test_results:
           path: code/test-results
       - persist_to_workspace:
           root: .
           paths:
-            - built-sandboxes
+            - sandbox
   test-runner-sandboxes:
     executor:
       class: medium+
diff --git a/scripts/task.ts b/scripts/task.ts
index 023bbd91c4c..428deb68aee 100644
--- a/scripts/task.ts
+++ b/scripts/task.ts
@@ -8,6 +8,7 @@ import { bootstrap } from './tasks/bootstrap';
 import { publish } from './tasks/publish';
 import { create } from './tasks/create';
 import { smokeTest } from './tasks/smoke-test';
+import { build } from './tasks/build';
 
 import TEMPLATES from '../code/lib/cli/src/repro-templates';
 
@@ -38,6 +39,7 @@ export const tasks = {
   publish,
   create,
   'smoke-test': smokeTest,
+  build,
 };
 
 type TaskKey = keyof typeof tasks;
diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts
new file mode 100644
index 00000000000..6ca28069da0
--- /dev/null
+++ b/scripts/tasks/build.ts
@@ -0,0 +1,14 @@
+import { pathExists } from 'fs-extra';
+import { join } from 'path';
+import type { Task } from '../task';
+import { exec } from '../utils/exec';
+
+export const build: Task = {
+  before: ['create'],
+  async ready(_, { sandboxDir }) {
+    return pathExists(join(sandboxDir, 'storybook-static'));
+  },
+  async run(_, { sandboxDir }) {
+    return exec(`yarn build-storybook --quiet`, { cwd: sandboxDir });
+  },
+};
diff --git a/scripts/tasks/smoke-test.ts b/scripts/tasks/smoke-test.ts
index eb603e5957f..d87ea323c3f 100644
--- a/scripts/tasks/smoke-test.ts
+++ b/scripts/tasks/smoke-test.ts
@@ -7,6 +7,6 @@ export const smokeTest: Task = {
     return false;
   },
   async run(_, { sandboxDir }) {
-    return exec(`'yarn storybook --smoke-test --quiet`, { cwd: sandboxDir });
+    return exec(`yarn storybook --smoke-test --quiet`, { cwd: sandboxDir });
   },
 };