diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml
index 7cde24b1ee..8e46a6a05c 100644
--- a/.github/actions/e2e/action.yml
+++ b/.github/actions/e2e/action.yml
@@ -99,7 +99,7 @@ runs:
       run: |
         echo "running: check EXTERNAL-CS is UP"
         set -u;
-        ./dist/libs/cli/bin/adf-cli \
+        ./node_modules/@alfresco/adf-cli/bin/adf-cli \
           check-cs-env \
           --host "$EXTERNAL_ACS_HOST" \
           -u "$E2E_USERNAME" \
@@ -111,7 +111,7 @@ runs:
       run: |
         echo "Running: Check CS is UP"
         set -u;
-        ./dist/libs/cli/bin/adf-cli \
+        ./node_modules/@alfresco/adf-cli/bin/adf-cli \
           check-cs-env \
           --host "$E2E_HOST" \
           -u "$E2E_USERNAME" \
@@ -123,7 +123,7 @@ runs:
       run: |
         echo "Running: check PS is UP"
         set -u;
-        ./dist/libs/cli/bin/adf-cli init-aps-env \
+        ./node_modules/@alfresco/adf-cli/bin/adf-cli init-aps-env \
           --host "$E2E_HOST" \
           -u "$E2E_USERNAME" \
           -p "$E2E_PASSWORD" \
@@ -135,7 +135,7 @@ runs:
       run: |
         echo "running: check PS-CLOUD is UP"
         set -u;
-        ./dist/libs/cli/bin/adf-cli init-aae-env \
+        ./node_modules/@alfresco/adf-cli/bin/adf-cli init-aae-env \
           --oauth "$E2E_IDENTITY_HOST_APA" \
           --host "$E2E_HOST_APA" \
           --modelerUsername "$E2E_MODELER_USERNAME" \
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index a79eace4a5..5306fd348c 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -205,9 +205,9 @@ jobs:
       - name: install
         run: |
           npm ci
-          npx nx run js-api:build
-          npx nx run cli:build
-          npx nx run testing:build
+          npx nx run js-api:bundle
+          npx nx run cli:bundle
+          npx nx run testing:bundle
       - run: npx nx print-affected $NX_CALCULATION_FLAGS
       - uses: ./.github/actions/upload-node-modules-and-artifacts
 
diff --git a/.github/workflows/release-branch.yml b/.github/workflows/release-branch.yml
index 5b9a97aeec..f4be76f60b 100644
--- a/.github/workflows/release-branch.yml
+++ b/.github/workflows/release-branch.yml
@@ -97,9 +97,9 @@ jobs:
       - name: install
         run: |
           npm ci
-          npx nx run js-api:build
-          npx nx run cli:build
-          npx nx run testing:build
+          npx nx run js-api:bundle
+          npx nx run cli:bundle
+          npx nx run testing:bundle
       - uses: ./.github/actions/upload-node-modules-and-artifacts
 
   release-npm:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 242044ac36..09a598dadb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -102,9 +102,9 @@ jobs:
       - name: install
         run: |
           npm ci
-          npx nx run js-api:build
-          npx nx run cli:build
-          npx nx run testing:build
+          npx nx run js-api:bundle
+          npx nx run cli:bundle
+          npx nx run testing:bundle
       - uses: ./.github/actions/upload-node-modules-and-artifacts
 
   release-demoshell:
diff --git a/lib/js-api/project.json b/lib/js-api/project.json
index 51931d3446..ffbe636611 100644
--- a/lib/js-api/project.json
+++ b/lib/js-api/project.json
@@ -41,6 +41,35 @@
         "lintFilePatterns": ["lib/js-api/**/*.ts"]
       }
     },
+    "bundle": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          {
+            "command": "echo cli bundle created"
+          }
+        ]
+      },
+      "dependsOn": [
+        "copyToNodeModules"
+      ]
+    },
+    "copyToNodeModules": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          {
+            "command": "rm -rf ./node_modules/@alfresco/js-api/ && mkdir -p ./node_modules/@alfresco/js-api/ && cp -R ./dist/libs/js-api/* ./node_modules/@alfresco/js-api/"
+          }
+        ]
+      },
+      "dependsOn": [
+        {
+          "projects": "self",
+          "target": "build"
+        }
+      ]
+    },
     "test": {
       "executor": "nx:run-commands",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],