diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4247ab816..7b200cf59 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,15 +12,15 @@ jobs:
 
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "yarn.lock" }}
-            - v1-dependencies-
+            - v4-dependencies-{{ checksum "yarn.lock" }}
+            - v4-dependencies-
 
       - run: yarn install
 
       - save_cache:
           paths:
             - node_modules
-          key: v1-dependencies-{{ checksum "yarn.lock" }}
+          key: v4-dependencies-{{ checksum "yarn.lock" }}
 
       - run: yarn lint
 
diff --git a/.github/workflows/chromatic-main-and-prs.yml b/.github/workflows/chromatic-main-and-prs.yml
index 7c39aa084..5d15bdaae 100644
--- a/.github/workflows/chromatic-main-and-prs.yml
+++ b/.github/workflows/chromatic-main-and-prs.yml
@@ -19,8 +19,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
+      - run: yarn set version berry
       - name: install
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - uses: chromaui/action@latest
         with:
           # 👇 Chromatic projectToken, refer to the manage page to obtain it.
diff --git a/.github/workflows/chromatic-prod.yml b/.github/workflows/chromatic-prod.yml
index 09e8d54c1..4355493e9 100644
--- a/.github/workflows/chromatic-prod.yml
+++ b/.github/workflows/chromatic-prod.yml
@@ -14,8 +14,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
+      - run: yarn set version berry
       - name: install
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - uses: chromaui/action@latest
         with:
           exitOnceUploaded: true
diff --git a/.github/workflows/chromatic-staging.yml b/.github/workflows/chromatic-staging.yml
index 6ac418df0..79235c3c7 100644
--- a/.github/workflows/chromatic-staging.yml
+++ b/.github/workflows/chromatic-staging.yml
@@ -14,8 +14,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
+      - run: yarn set version berry
       - name: install
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - uses: chromaui/action-canary@latest
         with:
           exitOnceUploaded: true
diff --git a/.github/workflows/smoke-test-action.yml b/.github/workflows/smoke-test-action.yml
index b0fae9d8f..593778a8e 100755
--- a/.github/workflows/smoke-test-action.yml
+++ b/.github/workflows/smoke-test-action.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
+      - run: yarn set version berry
       - run: yarn
       - run: yarn build
       - uses: ./
diff --git a/.github/workflows/smoke-test-node-api.yml b/.github/workflows/smoke-test-node-api.yml
index 51a30c5dc..0bbbdf429 100755
--- a/.github/workflows/smoke-test-node-api.yml
+++ b/.github/workflows/smoke-test-node-api.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: latest
+      - run: yarn set version berry
       - run: yarn
       - name: run chromatic via node
         run: ./scripts/run-via-node.mjs
diff --git a/.github/workflows/smoke-test-node18.yml b/.github/workflows/smoke-test-node18.yml
index a7d10bb09..3f19b5d26 100755
--- a/.github/workflows/smoke-test-node18.yml
+++ b/.github/workflows/smoke-test-node18.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
+      - run: yarn set version berry
       - run: yarn
       - run: yarn build
       - uses: ./
diff --git a/.github/workflows/smoke-test-node20.yml b/.github/workflows/smoke-test-node20.yml
index 95309e2f7..974890509 100755
--- a/.github/workflows/smoke-test-node20.yml
+++ b/.github/workflows/smoke-test-node20.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 20
+      - run: yarn set version berry
       - run: yarn
       - run: yarn build
       - uses: ./
diff --git a/.github/workflows/smoke-test-npx.yml b/.github/workflows/smoke-test-npx.yml
index 79d906f84..496579c3f 100644
--- a/.github/workflows/smoke-test-npx.yml
+++ b/.github/workflows/smoke-test-npx.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
+      - run: yarn set version berry
       - name: install
         run: yarn && git status --porcelain
       - name: prep package
diff --git a/.github/workflows/smoke-test-windows.yml b/.github/workflows/smoke-test-windows.yml
index 2350f70ca..bb8a127dd 100644
--- a/.github/workflows/smoke-test-windows.yml
+++ b/.github/workflows/smoke-test-windows.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
+      - run: yarn set version berry
       - name: install
         run: yarn && git status --porcelain
       - name: prep package
diff --git a/.github/workflows/smoke-test-yarn.yml b/.github/workflows/smoke-test-yarn.yml
index 4e664b638..274970062 100755
--- a/.github/workflows/smoke-test-yarn.yml
+++ b/.github/workflows/smoke-test-yarn.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: lts/*
+      - run: yarn set version berry
       - run: yarn
       - run: yarn build
       - run: yarn chromatic --build-script-name build-test-storybook --exit-zero-on-changes --force-rebuild