diff --git a/.circleci/config.yml b/.circleci/config.yml
index a1b3a6c15bd..57ce935724e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -65,8 +65,7 @@ commands:
             - run:
                   name: Build the project
                   command: |
-                      yarn workspace @spectrum-web-components/core build
-                      yarn workspace @spectrum-web-components/1st-gen build
+                      yarn build
 
             - save_cache:
                   paths:
diff --git a/1st-gen/package.json b/1st-gen/package.json
index 9682abe7189..a5dd157e761 100644
--- a/1st-gen/package.json
+++ b/1st-gen/package.json
@@ -210,7 +210,6 @@
     "wireit": {
         "build": {
             "dependencies": [
-                "prebuild",
                 "build:ts",
                 "build:types"
             ]
@@ -237,6 +236,7 @@
             "clean": "if-file-deleted",
             "command": "node ./scripts/build-ts.js",
             "dependencies": [
+                "prebuild",
                 "process-icons",
                 "test:create",
                 "build:css"
@@ -292,6 +292,7 @@
             "clean": "if-file-deleted",
             "command": "tsc --build tsconfig-all.json --pretty",
             "dependencies": [
+                "prebuild",
                 "process-icons",
                 "test:create",
                 "build:css"
@@ -374,7 +375,8 @@
                 "../2nd-gen/packages/core/package.json",
                 "../2nd-gen/packages/core/vite.config.js",
                 "../2nd-gen/packages/core/tsconfig.json"
-            ]
+            ],
+            "output": []
         },
         "prestorybook": {
             "command": "cem analyze --outdir storybook/",