diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index b28873d..c7d73ab 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -61,7 +61,11 @@ jobs:
         with:
           version: ${{ env.pnpm_version }}
       - run: pnpm install
+      
       - run: pnpm build
 
+      - name: pnpm install again for ensure the cli is available
+        run: pnpm install
+
       - name: Build the project
         run: pnpm exec nx run @examples/with-${{ matrix.runtime }}:build
diff --git a/package.json b/package.json
index 5c16cdf..c4c9a12 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint": "nx run-many -t lint --projects nammatham @infra/* --parallel=10",
     "lint:fix": "nx run-many -t lint:fix --projects nammatham @infra/* --parallel=10",
     "lint:fix:watch": "nodemon --watch . --ext ts --exec 'sleep 3 && run-s lint:fix'",
-    "build": "nx run-many -t build --parallel=10",
+    "build": "nx run nammatham:build",
     "azurite": "pnpx azurite --silent --location ./.azurite --debug ./.azurite/debug.log",
     "infra": "nx run @infra/azure-functions:start"
   },
diff --git a/packages/main/package.json b/packages/main/package.json
index 7cacb91..3045c25 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -19,12 +19,13 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "prepublishOnly": "npm run build",
-    "build": "tsup src/main.ts --dts --format esm",
+    "build": "run-s build:*",
+    "build:package": "tsup src/main.ts --dts --format esm",
     "build:cli": "tsup src/cli.ts --dts --format esm",
     "format": "prettier -w src",
     "lint": "tsc --noEmit && eslint ./src && prettier -c src",
     "lint:fix": "eslint --fix ./src && prettier -w src",
-    "dev": "nodemon --watch src --ext ts --exec 'run-p build build:cli'"
+    "dev": "nodemon --watch src --ext ts --exec 'run-s build'"
   },
   "keywords": [
     "azure-functions",