diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8a067a202..1674c0a9e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
         if: ${{ runner.os == 'macOS' && inputs.profile == 'canary' }}
         run: dsymutil packages/*/*/*.node
       - name: Upload debug symbols
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ inputs.profile == 'canary' }}
         with:
           name: debug-symbols-${{ matrix.name }}
@@ -69,7 +69,7 @@ jobs:
       - name: Strip debug symbols # https://github.com/rust-lang/rust/issues/46034
         run: strip -x packages/*/*/*.node # Must use -x on macOS. This produces larger results on linux.
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-${{ matrix.name }}
           path: packages/*/*/*.node
@@ -85,7 +85,7 @@ jobs:
     container:
       image: node:22.4-bullseye
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
@@ -102,7 +102,7 @@ jobs:
           find packages -name "*.node" -type f -exec objcopy --strip-debug --strip-unneeded {} \;
           find packages -name "*.node" -type f -exec objcopy --add-gnu-debuglink={}.debug {} \;
       - name: Upload debug symbols
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ inputs.profile == 'canary' }}
         with:
           name: debug-symbols-linux-gnu-x64
@@ -110,11 +110,11 @@ jobs:
       - name: Strip debug symbols # https://github.com/rust-lang/rust/issues/46034
         run: strip packages/*/*/*.node
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-linux-gnu-x64
           path: packages/*/*/*.node
-      - name: debug
+      - name: Debug
         run: ls -l packages/*/*/*.node
       - name: Smoke test
         run: node -e 'require("@atlaspack/rust")'
@@ -164,7 +164,7 @@ jobs:
           find packages -name "*.node" -type f -exec ${{ matrix.objcopy }} --strip-debug --strip-unneeded {} \;
           find packages -name "*.node" -type f -exec ${{ matrix.objcopy }} --add-gnu-debuglink={}.debug {} \;
       - name: Upload debug symbols
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ inputs.profile == 'canary' }}
         with:
           name: debug-symbols-${{ matrix.target }}
@@ -172,16 +172,16 @@ jobs:
       - name: Strip debug symbols # https://github.com/rust-lang/rust/issues/46034
         run: ${{ matrix.strip }} packages/*/*/*.node
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bindings-${{ matrix.target }}
           path: packages/*/*/*.node
-      - name: debug
+      - name: Debug
         run: ls -l packages/*/*/*.node
       - name: Configure binfmt-support
         run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
       - name: Smoke test
-        uses: addnab/docker-run-action@v1
+        uses: addnab/docker-run-action@v3
         with:
           image: ghcr.io/devongovett/multiarch-node:node14-${{ matrix.arch }}-focal
           options: -v ${{github.workspace}}:/work
@@ -202,7 +202,7 @@ jobs:
       - name: Build native packages
         run: yarn build-native-${{ inputs.profile }}
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Move bindings
@@ -215,14 +215,13 @@ jobs:
           find artifacts -name "*.node" -path "**/DWARF/**" -exec cp {} debug-symbols/ \;
           ls -l debug-symbols
       - name: Upload combined debug symbols artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ inputs.profile == 'canary' }}
         with:
           name: debug-symbols
           path: debug-symbols/**
       - name: Debug
-        run: |
-          ls -l packages/*/*/*.node
+        run: ls -l packages/*/*/*.node
       - run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.prettierignore b/.prettierignore
index 5e12a29bc..9ba5c3149 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -13,4 +13,4 @@ tmp
 # Ignoring main README for now because generated Table of Contents adds a line that prettier removes
 # in precommit hook, causing `yarn lint:readme` to fail
 /README.md
-/packages/core/atlaspack/README.md
+/packages/core/cli/README.md
diff --git a/README.md b/README.md
index 0ea8c4ece..998be841a 120000
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-./packages/core/atlaspack/README.md
\ No newline at end of file
+packages/core/cli/README.md
\ No newline at end of file
diff --git a/packages/core/atlaspack/.npmignore b/packages/core/cli/.npmignore
similarity index 100%
rename from packages/core/atlaspack/.npmignore
rename to packages/core/cli/.npmignore
diff --git a/packages/core/atlaspack/README.md b/packages/core/cli/README.md
similarity index 98%
rename from packages/core/atlaspack/README.md
rename to packages/core/cli/README.md
index 26345581b..5cbfd1554 100644
--- a/packages/core/atlaspack/README.md
+++ b/packages/core/cli/README.md
@@ -20,7 +20,7 @@ Special thanks to [Devon](https://github.com/devongovett) for his invaluable con
 ## Installation
 
 ```sh
-npm install --save-dev atlaspack
+npm install --save-dev @atlaspack/cli
 ```
 
 ## Usage
diff --git a/packages/core/atlaspack/bin/atlaspack.js b/packages/core/cli/bin/atlaspack.js
similarity index 100%
rename from packages/core/atlaspack/bin/atlaspack.js
rename to packages/core/cli/bin/atlaspack.js
diff --git a/packages/core/atlaspack/bin/dev-bin.js b/packages/core/cli/bin/dev-bin.js
similarity index 100%
rename from packages/core/atlaspack/bin/dev-bin.js
rename to packages/core/cli/bin/dev-bin.js
diff --git a/packages/core/atlaspack/ensure-no-dev-lib.sh b/packages/core/cli/ensure-no-dev-lib.sh
similarity index 100%
rename from packages/core/atlaspack/ensure-no-dev-lib.sh
rename to packages/core/cli/ensure-no-dev-lib.sh
diff --git a/packages/core/atlaspack/package.json b/packages/core/cli/package.json
similarity index 93%
rename from packages/core/atlaspack/package.json
rename to packages/core/cli/package.json
index f4f46f1c1..c31b13d3d 100644
--- a/packages/core/atlaspack/package.json
+++ b/packages/core/cli/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "atlaspack",
+  "name": "@atlaspack/cli",
   "version": "2.12.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
@@ -10,7 +10,9 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "bin": "bin/atlaspack.js",
+  "bin": {
+    "atlaspack": "bin/atlaspack.js"
+  },
   "main": "lib/bin.js",
   "source": "src/bin.js",
   "scripts": {
diff --git a/packages/core/atlaspack/src/.eslintrc.json b/packages/core/cli/src/.eslintrc.json
similarity index 100%
rename from packages/core/atlaspack/src/.eslintrc.json
rename to packages/core/cli/src/.eslintrc.json
diff --git a/packages/core/atlaspack/src/bin.js b/packages/core/cli/src/bin.js
similarity index 100%
rename from packages/core/atlaspack/src/bin.js
rename to packages/core/cli/src/bin.js
diff --git a/packages/core/atlaspack/src/cli.js b/packages/core/cli/src/cli.js
similarity index 100%
rename from packages/core/atlaspack/src/cli.js
rename to packages/core/cli/src/cli.js
diff --git a/packages/core/integration-tests/package.json b/packages/core/integration-tests/package.json
index d2d24caa5..41c93bafa 100644
--- a/packages/core/integration-tests/package.json
+++ b/packages/core/integration-tests/package.json
@@ -12,6 +12,7 @@
     "test-ci": "yarn test --config .mocharc.ci.json --reporter mocha-multi-reporters --reporter-options configFile=./test/mochareporters.json"
   },
   "devDependencies": {
+    "@atlaspack/cli": "2.12.0",
     "@babel/core": "^7.22.11",
     "@babel/plugin-syntax-class-properties": "^7.12.13",
     "@babel/plugin-syntax-export-default-from": "^7.22.5",
@@ -39,7 +40,6 @@
     "lodash": "^4.17.15",
     "ncp": "^2.0.0",
     "nib": "^1.1.2",
-    "atlaspack": "2.12.0",
     "postcss": "^8.4.5",
     "postcss-custom-properties": "^12.1.2",
     "postcss-import": "^14.0.2",
diff --git a/packages/core/integration-tests/test/atlaspack-link.js b/packages/core/integration-tests/test/atlaspack-link.js
index 6ce23b27a..5a4bb40f2 100644
--- a/packages/core/integration-tests/test/atlaspack-link.js
+++ b/packages/core/integration-tests/test/atlaspack-link.js
@@ -100,13 +100,13 @@ describe.v2('@atlaspack/link', () => {
       );
 
       assert.equal(
-        overlayFS.realpathSync('node_modules/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack'),
+        overlayFS.realpathSync('node_modules/@atlaspack/cli'),
+        path.resolve(__dirname, '../../cli'),
       );
 
       assert.equal(
         overlayFS.realpathSync('node_modules/.bin/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack/src/bin.js'),
+        path.resolve(__dirname, '../../cli/src/bin.js'),
       );
     });
 
@@ -115,14 +115,15 @@ describe.v2('@atlaspack/link', () => {
         app
           yarn.lock:
           node_modules
-            atlaspack
+            @atlaspack/cli
             @atlaspack/core
         package-root
           core
+            cli
+              package.json: ${{name: '@atlaspack/cli'}}
+              src/bin.js:
             core/package.json: ${{name: '@atlaspack/core'}}
-            atlaspack
-              package.json: ${{name: 'atlaspack'}}
-              src/bin.js:`;
+      `;
 
       overlayFS.chdir('/app');
 
@@ -137,16 +138,13 @@ describe.v2('@atlaspack/link', () => {
       );
 
       assert.equal(
-        overlayFS.realpathSync('node_modules/atlaspack'),
-        path.resolve(overlayFS.cwd(), '../package-root/core/atlaspack'),
+        overlayFS.realpathSync('node_modules/@atlaspack/cli'),
+        path.resolve(overlayFS.cwd(), '../package-root/core/cli'),
       );
 
       assert.equal(
         overlayFS.realpathSync('node_modules/.bin/atlaspack'),
-        path.resolve(
-          overlayFS.cwd(),
-          '../package-root/core/atlaspack/src/bin.js',
-        ),
+        path.resolve(overlayFS.cwd(), '../package-root/core/cli/src/bin.js'),
       );
     });
 
@@ -156,8 +154,9 @@ describe.v2('@atlaspack/link', () => {
         node_modules
           .bin/atlaspack:
           @namespace
-            atlaspack
-            atlaspack-core`;
+            atlaspack-cli
+            atlaspack-core
+      `;
 
       let cli = createProgram({fs: overlayFS});
       await cli('link --namespace @namespace');
@@ -166,7 +165,7 @@ describe.v2('@atlaspack/link', () => {
 
       assert.equal(
         overlayFS.realpathSync('node_modules/.bin/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack/src/bin.js'),
+        path.resolve(__dirname, '../../cli/src/bin.js'),
       );
 
       assert.equal(
@@ -180,18 +179,18 @@ describe.v2('@atlaspack/link', () => {
       );
 
       assert.equal(
-        overlayFS.realpathSync('node_modules/@namespace/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack'),
+        overlayFS.realpathSync('node_modules/@namespace/atlaspack-cli'),
+        path.resolve(__dirname, '../../cli'),
       );
 
       assert.equal(
-        overlayFS.realpathSync('node_modules/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack'),
+        overlayFS.realpathSync('node_modules/@atlaspack/cli'),
+        path.resolve(__dirname, '../../cli'),
       );
 
       assert.equal(
         overlayFS.realpathSync('node_modules/.bin/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack/src/bin.js'),
+        path.resolve(__dirname, '../../cli/src/bin.js'),
       );
     });
 
@@ -252,8 +251,9 @@ describe.v2('@atlaspack/link', () => {
       await fsFixture(overlayFS)`
         yarn.lock:
         tools
-          test/node_modules/atlaspack
-          test2/node_modules/@atlaspack/core`;
+          test/node_modules/@atlaspack/cli
+          test2/node_modules/@atlaspack/core
+      `;
 
       let cli = createProgram({fs: overlayFS});
       await cli('link --node-modules-glob "tools/*/node_modules"');
@@ -261,19 +261,19 @@ describe.v2('@atlaspack/link', () => {
       assert(overlayFS.existsSync('.atlaspack-link'));
 
       assert(overlayFS.existsSync('tools/test/node_modules'));
-      assert(!overlayFS.existsSync('tools/test/node_modules/atlaspack'));
+      assert(!overlayFS.existsSync('tools/test/node_modules/@atlaspack/cli'));
 
       assert(overlayFS.existsSync('tools/test2/node_modules'));
       assert(!overlayFS.existsSync('tools/test2/node_modules/@atlaspack/core'));
 
       assert.equal(
-        overlayFS.realpathSync('node_modules/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack'),
+        overlayFS.realpathSync('node_modules/@atlaspack/cli'),
+        path.resolve(__dirname, '../../cli'),
       );
 
       assert.equal(
         overlayFS.realpathSync('node_modules/.bin/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack/src/bin.js'),
+        path.resolve(__dirname, '../../cli/src/bin.js'),
       );
 
       assert.equal(
@@ -286,8 +286,9 @@ describe.v2('@atlaspack/link', () => {
       await fsFixture(overlayFS)`
         yarn.lock:
         node_modules
-          atlaspack
-          @atlaspack/core`;
+          @atlaspack/cli
+          @atlaspack/core
+      `;
 
       let cli = createProgram({fs: overlayFS});
       await cli('link --dry-run');
@@ -300,8 +301,8 @@ describe.v2('@atlaspack/link', () => {
       );
 
       assert.equal(
-        overlayFS.realpathSync('node_modules/atlaspack'),
-        path.resolve('/app/node_modules/atlaspack'),
+        overlayFS.realpathSync('node_modules/@atlaspack/cli'),
+        path.resolve('/app/node_modules/@atlaspack/cli'),
       );
 
       assert(!overlayFS.existsSync('node_modules/.bin/atlaspack'));
@@ -354,11 +355,8 @@ describe.v2('@atlaspack/link', () => {
       await fsFixture(overlayFS)`
         yarn.lock:
         node_modules
-          .bin/atlaspack -> ${path.resolve(
-            __dirname,
-            '../../atlaspack/src/bin.js',
-          )}
-          atlaspack -> ${path.resolve(__dirname, '../../atlaspack')}
+          .bin/atlaspack -> ${path.resolve(__dirname, '../../cli/src/bin.js')}
+          @atlaspack/cli -> ${path.resolve(__dirname, '../../cli')}
           @atlaspack/core -> ${path.resolve(__dirname, '../../core')}
         .atlaspack-link: ${{
           appRoot: '/app',
@@ -368,17 +366,17 @@ describe.v2('@atlaspack/link', () => {
         }}`;
 
       assert(overlayFS.existsSync('.atlaspack-link'));
-      assert(overlayFS.existsSync('node_modules/@atlaspack/core'));
-      assert(overlayFS.existsSync('node_modules/atlaspack'));
       assert(overlayFS.existsSync('node_modules/.bin/atlaspack'));
+      assert(overlayFS.existsSync('node_modules/@atlaspack/cli'));
+      assert(overlayFS.existsSync('node_modules/@atlaspack/core'));
 
       let cli = createProgram({fs: overlayFS});
       await cli('unlink');
 
       assert(!overlayFS.existsSync('.atlaspack-link'));
-      assert(!overlayFS.existsSync('node_modules/@atlaspack/core'));
-      assert(!overlayFS.existsSync('node_modules/atlaspack'));
       assert(!overlayFS.existsSync('node_modules/.bin/atlaspack'));
+      assert(!overlayFS.existsSync('node_modules/@atlaspack/cli'));
+      assert(!overlayFS.existsSync('node_modules/@atlaspack/core'));
     });
 
     it('unlinks from a custom package root', async () => {
@@ -390,21 +388,23 @@ describe.v2('@atlaspack/link', () => {
           nodeModulesGlobs: ['node_modules'],
           namespace: '@atlaspack',
         }}
-        node_modules/atlaspack -> package-root/core/atlaspack
+        node_modules/.bin/atlaspack -> package-root/core/cli/src/bin.js
+        node_modules/@atlaspack/cli -> package-root/core/cli
         node_modules/@atlaspack/core -> package-root/core/core
-        node_modules/.bin/atlaspack -> package-root/core/atlaspack/src/bin.js`;
+      `;
 
       await fsFixture(overlayFS, '/')`
+        package-root/core/cli/package.json: ${{name: '@atlaspack/cli'}}
+        package-root/core/cli/src/bin.js:
         package-root/core/core/package.json: ${{name: '@atlaspack/core'}}
-        package-root/core/atlaspack/package.json: ${{name: 'atlaspack'}}
-        package-root/core/atlaspack/src/bin.js:`;
+      `;
 
       let cli = createProgram({fs: overlayFS});
       await cli('unlink');
 
       assert(!overlayFS.existsSync('.atlaspack-link'));
+      assert(!overlayFS.existsSync('node_modules/@atlaspack/cli'));
       assert(!overlayFS.existsSync('node_modules/@atlaspack/core'));
-      assert(!overlayFS.existsSync('node_modules/atlaspack'));
       assert(!overlayFS.existsSync('node_modules/.bin/atlaspack'));
     });
 
@@ -418,12 +418,9 @@ describe.v2('@atlaspack/link', () => {
           namespace: '@namespace',
         }}
         node_modules
-          .bin/atlaspack -> ${path.resolve(
-            __dirname,
-            '../../atlaspack/src/bin.js',
-          )}
-          atlaspack -> ${path.resolve(__dirname, '../../atlaspack')}
-          @namespace/atlaspack -> ${path.resolve(__dirname, '../../atlaspack')}
+          .bin/atlaspack -> ${path.resolve(__dirname, '../../cli/src/bin.js')}
+          atlaspack/cli -> ${path.resolve(__dirname, '../../cli')}
+          @namespace/atlaspack-cli -> ${path.resolve(__dirname, '../../cli')}
           atlaspack/core -> ${path.resolve(__dirname, '../../core')}
           @namespace/atlaspack-core -> ${path.resolve(
             __dirname,
@@ -435,10 +432,10 @@ describe.v2('@atlaspack/link', () => {
 
       assert(!overlayFS.existsSync('.atlaspack-link'));
       assert(!overlayFS.existsSync('node_modules/@atlaspack/core'));
-      assert(!overlayFS.existsSync('node_modules/atlaspack'));
+      assert(!overlayFS.existsSync('node_modules/@atlaspack/cli'));
       assert(!overlayFS.existsSync('node_modules/.bin/atlaspack'));
       assert(!overlayFS.existsSync('node_modules/@namespace/atlaspack-core'));
-      assert(!overlayFS.existsSync('node_modules/@namespace/atlaspack'));
+      assert(!overlayFS.existsSync('node_modules/@namespace/atlaspack-cli'));
     });
 
     // FIXME: this test fails on windows
@@ -509,12 +506,9 @@ describe.v2('@atlaspack/link', () => {
           namespace: '@atlaspack',
         }}
         node_modules
-          atlaspack -> ${path.resolve(__dirname, '../../atlaspack')}
+          .bin/atlaspack -> ${path.resolve(__dirname, '../../cli/src/bin.js')}
+          @atlaspack/cli -> ${path.resolve(__dirname, '../../cli')}
           @atlaspack/core -> ${path.resolve(__dirname, '../../core')}
-          .bin/atlaspack -> ${path.resolve(
-            __dirname,
-            '../../atlaspack/src/bin.js',
-          )}
         tools
           test/node_modules/atlaspack -> ${path.resolve(
             __dirname,
@@ -540,11 +534,8 @@ describe.v2('@atlaspack/link', () => {
       await fsFixture(overlayFS)`
         yarn.lock:
         node_modules
-          .bin/atlaspack -> ${path.resolve(
-            __dirname,
-            '../../atlaspack/src/bin.js',
-          )}
-          atlaspack -> ${path.resolve(__dirname, '../../atlaspack')}
+          .bin/atlaspack -> ${path.resolve(__dirname, '../../cli/src/bin.js')}
+          @atlaspack/cli -> ${path.resolve(__dirname, '../../cli')}
           @atlaspack/core -> ${path.resolve(__dirname, '../../core')}
         .atlaspack-link: ${{
           appRoot: '/app',
@@ -565,13 +556,13 @@ describe.v2('@atlaspack/link', () => {
       );
 
       assert.equal(
-        overlayFS.realpathSync('node_modules/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack'),
+        overlayFS.realpathSync('node_modules/@atlaspack/cli'),
+        path.resolve(__dirname, '../../cli'),
       );
 
       assert.equal(
         overlayFS.realpathSync('node_modules/.bin/atlaspack'),
-        path.resolve(__dirname, '../../atlaspack/src/bin.js'),
+        path.resolve(__dirname, '../../cli/src/bin.js'),
       );
     });
   });
diff --git a/packages/core/integration-tests/test/babel.js b/packages/core/integration-tests/test/babel.js
index 3beb0dbdc..7f1c13a61 100644
--- a/packages/core/integration-tests/test/babel.js
+++ b/packages/core/integration-tests/test/babel.js
@@ -21,7 +21,7 @@ import {spawnSync} from 'child_process';
 import tempy from 'tempy';
 import {md} from '@atlaspack/diagnostic';
 
-const atlaspackCli = require.resolve('atlaspack/src/bin.js');
+const atlaspackCli = require.resolve('@atlaspack/cli/src/bin.js');
 const inputDir = path.join(__dirname, '/input');
 
 describe.v2('babel', function () {
diff --git a/packages/core/integration-tests/test/integration/target-source/package.json b/packages/core/integration-tests/test/integration/target-source/package.json
index 33fc5621b..6c0596881 100644
--- a/packages/core/integration-tests/test/integration/target-source/package.json
+++ b/packages/core/integration-tests/test/integration/target-source/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "clean": "rm -rf ../.atlaspack-cache dist",
     "demo": "yarn clean && ATLASPACK_WORKERS=0 atlaspack build packages/package-a",
-    "debug": "yarn clean && ATLASPACK_WORKERS=0 node --inspect-brk ../../core/atlaspack/src/bin.js build packages/*",
+    "debug": "yarn clean && ATLASPACK_WORKERS=0 node --inspect-brk ../../core/cli/src/bin.js build packages/*",
     "watch": "nodemon -w ../../ -i packages/package-a/dist -i packages/package-b/dist -i ../.atlaspack-cache -d 2 -x yarn demo"
   }
 }
diff --git a/packages/core/test-utils/test/fsFixture.test.js b/packages/core/test-utils/test/fsFixture.test.js
index f13290ecc..92b1864e0 100644
--- a/packages/core/test-utils/test/fsFixture.test.js
+++ b/packages/core/test-utils/test/fsFixture.test.js
@@ -526,12 +526,9 @@ describe('fsFixture', () => {
         yarn.lock:
         node_modules
           .bin
-            atlaspack -> ${path.resolve(
-              __dirname,
-              '../../atlaspack/src/bin.js',
-            )}
-          atlaspack -> ${path.resolve(__dirname, '../../atlaspack')}
+            atlaspack -> ${path.resolve(__dirname, '../../cli/src/bin.js')}
           @atlaspack
+            cli -> ${path.resolve(__dirname, '../../cli')}
             core -> ${path.resolve(__dirname, '../../core')}
         .atlaspackrc: ${{
           extends: '@atlaspack/config-default',
@@ -555,12 +552,12 @@ describe('fsFixture', () => {
 
     assert.equal(
       fs.realpathSync('/app/node_modules/.bin/atlaspack'),
-      path.resolve(__dirname, '../../atlaspack/src/bin.js'),
+      path.resolve(__dirname, '../../cli/src/bin.js'),
     );
 
     assert.equal(
-      fs.realpathSync('/app/node_modules/atlaspack'),
-      path.resolve(__dirname, '../../atlaspack'),
+      fs.realpathSync('/app/node_modules/@atlaspack/cli'),
+      path.resolve(__dirname, '../../cli'),
     );
 
     assert.equal(
diff --git a/packages/dev/atlaspack-link/src/link.js b/packages/dev/atlaspack-link/src/link.js
index 4033a7913..7a19e9d85 100644
--- a/packages/dev/atlaspack-link/src/link.js
+++ b/packages/dev/atlaspack-link/src/link.js
@@ -67,11 +67,11 @@ export async function link(
     await fsSymlink(p, path.join(appRoot, 'node_modules', packageName), opts);
   }
 
-  // Step 4: Point `atlaspack` bin symlink to linked `packages/core/atlaspack/src/bin.js`
+  // Step 4: Point `atlaspack` bin symlink to linked `packages/core/cli/src/bin.js`
   // --------------------------------------------------------------------------------
 
   await fsSymlink(
-    path.join(packageRoot, 'core/atlaspack/src/bin.js'),
+    path.join(packageRoot, 'core/cli/src/bin.js'),
     path.join(appRoot, 'node_modules/.bin/atlaspack'),
     opts,
   );
diff --git a/packages/examples/eslint-example/package.json b/packages/examples/eslint-example/package.json
index f0601de58..c40a77053 100644
--- a/packages/examples/eslint-example/package.json
+++ b/packages/examples/eslint-example/package.json
@@ -19,8 +19,8 @@
   "devDependencies": {
     "@babel/core": "^7.22.11",
     "@atlaspack/babel-register": "2.12.0",
+    "@atlaspack/cli": "2.12.0",
     "@atlaspack/core": "2.12.0",
-    "@atlaspack/validator-eslint": "2.12.0",
-    "atlaspack": "2.12.0"
+    "@atlaspack/validator-eslint": "2.12.0"
   }
 }
diff --git a/packages/examples/html/package.json b/packages/examples/html/package.json
index 7426ee181..f8487d8a3 100644
--- a/packages/examples/html/package.json
+++ b/packages/examples/html/package.json
@@ -14,7 +14,7 @@
   "devDependencies": {
     "@babel/core": "^7.22.11",
     "@atlaspack/babel-register": "2.12.0",
-    "atlaspack": "2.12.0"
+    "@atlaspack/cli": "2.12.0"
   },
   "dependencies": {
     "lodash": "^4.17.11",
diff --git a/packages/examples/kitchen-sink/package.json b/packages/examples/kitchen-sink/package.json
index 81c7b6dc7..865448061 100644
--- a/packages/examples/kitchen-sink/package.json
+++ b/packages/examples/kitchen-sink/package.json
@@ -10,11 +10,11 @@
   "devDependencies": {
     "@babel/core": "^7.22.11",
     "@atlaspack/babel-register": "2.12.0",
+    "@atlaspack/cli": "2.12.0",
     "@atlaspack/config-default": "2.12.0",
     "@atlaspack/core": "2.12.0",
     "@atlaspack/optimizer-esbuild": "2.12.0",
-    "@atlaspack/reporter-sourcemap-visualiser": "2.12.0",
-    "atlaspack": "2.12.0"
+    "@atlaspack/reporter-sourcemap-visualiser": "2.12.0"
   },
   "targets": {
     "browserModern": {
diff --git a/packages/examples/react-hmr/package.json b/packages/examples/react-hmr/package.json
index 854d133ba..2b32f57ec 100644
--- a/packages/examples/react-hmr/package.json
+++ b/packages/examples/react-hmr/package.json
@@ -7,7 +7,7 @@
     "demo": "atlaspack serve src/index.html --no-cache --https"
   },
   "devDependencies": {
-    "atlaspack": "2.12.0"
+    "@atlaspack/cli": "2.12.0"
   },
   "targets": {
     "browserModern": {
diff --git a/packages/examples/three/package.json b/packages/examples/three/package.json
index e0b8eaddc..cb7c774bd 100644
--- a/packages/examples/three/package.json
+++ b/packages/examples/three/package.json
@@ -27,9 +27,9 @@
     }
   },
   "devDependencies": {
+    "@atlaspack/cli": "2.12.0",
     "@atlaspack/config-default": "2.12.0",
     "@atlaspack/core": "2.12.0",
-    "@atlaspack/optimizer-esbuild": "2.12.0",
-    "atlaspack": "2.12.0"
+    "@atlaspack/optimizer-esbuild": "2.12.0"
   }
 }