diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 615e44f42..e30341803 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: lint affected
         if: ${{ github.event_name == 'pull_request' }}
-        run: pnpm affected:lint -- --base=origin/develop
+        run: pnpm affected:lint --base=origin/develop
       - name: lint all
         if: ${{ github.event_name != 'pull_request' }}
         run: pnpm ci:lint
@@ -127,7 +127,7 @@ jobs:
 
       - name: Test
         if: ${{ github.event_name == 'pull_request' }}
-        run: pnpm affected:test -- --browsers=ChromeHeadless --watch=false $TEST_OPTS --base=origin/develop
+        run: pnpm affected:test --browsers=ChromeHeadless --watch=false $TEST_OPTS --base=origin/develop
 
       - name: Test all
         if: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index daf843300..f33cacd2e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -62,7 +62,7 @@ jobs:
 
       - uses: ./.github/actions/setup
       - run: pnpm install --frozen-lockfile
-      - run: pnpm affected:lint -- --base=origin/develop
+      - run: pnpm affected:lint --base=origin/develop
       - run: pnpm stylelint
 
   unit-tests:
@@ -84,7 +84,7 @@ jobs:
 
       - uses: ./.github/actions/before-install
       - run: pnpm install --frozen-lockfile
-      - run: pnpm affected:test -- --browsers=ChromeHeadless --watch=false $TEST_OPTS --base=origin/develop
+      - run: pnpm affected:test --browsers=ChromeHeadless --watch=false $TEST_OPTS --base=origin/develop
 
   publish-docker-registry:
     if: ${{ always() }}
diff --git a/docs/tutorials/how-to-install-an-existing-extension.md b/docs/tutorials/how-to-install-an-existing-extension.md
index 799a3800f..836afbea9 100644
--- a/docs/tutorials/how-to-install-an-existing-extension.md
+++ b/docs/tutorials/how-to-install-an-existing-extension.md
@@ -38,13 +38,13 @@ In case of errors, add the following configuration to the `tsconfig.json` file.
 
 # Making the extension as part of the ACA application
 
-Now that the ACA extension is developed in its initial version, let's add the extension module to the list of the ones used by the application. To complete the task you can follow the same task described for the tutorial named [How to create your first extension for the Alfresco Content Application (aka ACA)](how-to-create-your-first-extension.md) (paragraph “Making the extension as part of the ACA application“). Once the extension is installed with success (`npm install my-extension`), the task can be considered as completed.
+Now that the ACA extension is developed in its initial version, let's add the extension module to the list of the ones used by the application. To complete the task you can follow the same task described for the tutorial named [How to create your first extension for the Alfresco Content Application (aka ACA)](how-to-create-your-first-extension.md) (paragraph “Making the extension as part of the ACA application“). Once the extension is installed with success (`pnpm add my-extension`), the task can be considered as completed.
 
 # Running ACA with the extension included
 
 Now that everything is properly developed, it’s time to launch ACA and see the result. To launch ADW, run the following command from a terminal.
 
-    npm start
+    pnpm start
 
 What you should see is a new item in left menu of the landing page for ACA, implementing the route to a new page with the following content. Below the screenshot describing what it should look like.
 
diff --git a/nx.json b/nx.json
index be6236dd7..a1674458d 100644
--- a/nx.json
+++ b/nx.json
@@ -38,5 +38,6 @@
   },
   "cacheDirectory": "nxcache",
   "useInferencePlugins": false,
-  "useLegacyCache": true
+  "useLegacyCache": true,
+  "analytics": false
 }
diff --git a/package.json b/package.json
index baa9ea52e..8e62e747d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "nx serve content-ce",
     "start:prod": "node --max-old-space-size=8192 nx serve content-ce --configuration production",
     "build": "nx build content-ce",
-    "build.release": "pnpm build -- --configuration=production,release",
+    "build.release": "pnpm build --configuration=production,release",
     "test": "nx test",
     "lint": "NODE_OPTIONS=--max_old_space_size=4096 nx run-many --all --target=lint",
     "inspect.bundle": "nx build content-ce --configuration production --stats-json && webpack-bundle-analyzer dist/content-ce/stats.json",
diff --git a/scripts/generate-reports.sh b/scripts/generate-reports.sh
index 43deda98b..e7f0a2a84 100755
--- a/scripts/generate-reports.sh
+++ b/scripts/generate-reports.sh
@@ -2,6 +2,6 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
-npm run ci:audit
-npm run ci:licenses
-npm run ci:changelog
+pnpm ci:audit
+pnpm ci:licenses
+pnpm ci:changelog
diff --git a/scripts/update-version.sh b/scripts/update-version.sh
index ccb38d87a..0374770ac 100755
--- a/scripts/update-version.sh
+++ b/scripts/update-version.sh
@@ -35,15 +35,15 @@ update(){
         eval libsWithVersions=( "${libsWithVersions[@]}" "${EXACT_VERSION}" )
     done
 
-    echo "npm i --ignore-scripts -E ${libsWithVersions[*]}"
-    npm i --ignore-scripts -E ${libsWithVersions[*]}
+    echo "pnpm add --ignore-scripts -E ${libsWithVersions[*]}"
+    pnpm add --ignore-scripts -E ${libsWithVersions[*]}
 }
 
 update_js_api(){
     eval jsWithVersions=();
 
-    echo "npm i --ignore-scripts -E @alfresco/js-api@${JS_VERSION}"
-    npm i --ignore-scripts -E @alfresco/js-api@${JS_VERSION}
+    echo "pnpm add --ignore-scripts -E @alfresco/js-api@${JS_VERSION}"
+    pnpm add --ignore-scripts -E @alfresco/js-api@${JS_VERSION}
 }
 
 while [[ $1  == -* ]]; do