diff --git a/angular.json b/angular.json
index 723f0d0381..8b5f5f739e 100644
--- a/angular.json
+++ b/angular.json
@@ -812,7 +812,7 @@
       "projectType": "library",
       "prefix": "adf",
       "architect": {
-        "build": {
+        "build-local": {
           "builder": "@nrwl/node:webpack",
           "options": {
             "projectRoot": "lib/testing",
@@ -846,15 +846,34 @@
             ]
           }
         },
-        "copydist": {
+        "bundle": {
           "executor": "nx:run-commands",
-              "options": {
-              "commands": [
-                  {
-                      "command": "rm -rf ./node_modules/@alfresco/adf-testing/ && mkdir -p ./node_modules/@alfresco/adf-testing/ &&  cp -R ./dist/libs/testing/* ./node_modules/@alfresco/adf-testing/"
-                  }
-              ]
-          }
+          "options": {
+            "commands": [
+              {
+                "command": "echo testing bundle created"
+              }
+            ]
+          },
+          "dependsOn": [
+            "copyToNodeModules"
+          ]
+        },
+        "copyToNodeModules": {
+          "executor": "nx:run-commands",
+          "options": {
+            "commands": [
+              {
+                "command": "rm -rf ./node_modules/@alfresco/adf-testing/ && mkdir -p ./node_modules/@alfresco/adf-testing/ &&  cp -R ./dist/libs/testing/* ./node_modules/@alfresco/adf-testing/"
+              }
+            ]
+          },
+          "dependsOn": [
+            {
+              "projects": "self",
+              "target": "build-local"
+            }
+          ]
         }
       }
     },
@@ -864,11 +883,11 @@
       "projectType": "library",
       "prefix": "adf",
       "architect": {
-        "build": {
+        "build-local": {
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "commands": [
-              "cd lib/cli && npm i && npm run dist && nx run cli:copydist"
+              "cd lib/cli && npm i && npm run dist"
             ]
           },
           "configurations": {
@@ -877,6 +896,48 @@
             }
           }
         },
+        "bundle": {
+          "executor": "nx:run-commands",
+          "options": {
+            "commands": [
+              {
+                "command": "echo cli bundle created"
+              }
+            ]
+          },
+          "dependsOn": [
+            "copyToNodeModules"
+          ]
+        },
+        "moveToDist": {
+          "executor": "nx:run-commands",
+          "options": {
+            "commands": [
+              {
+                "command": "mkdir -p ./dist/libs/cli && cp -R ./lib/cli/dist/* dist/libs/cli/"
+              }
+            ]
+          },
+          "dependsOn": [
+            {
+              "projects": "self",
+              "target": "build-local"
+            }
+          ]
+        },
+        "copyToNodeModules": {
+          "executor": "nx:run-commands",
+          "options": {
+            "commands": [
+              {
+                "command": "rm -rf ./node_modules/@alfresco/adf-cli/ && mkdir -p ./node_modules/@alfresco/adf-cli/ && cp -R ./dist/libs/cli/* ./node_modules/@alfresco/adf-cli/"
+              }
+            ]
+          },
+          "dependsOn": [
+            "moveToDist"
+          ]
+        },
         "lint": {
           "builder": "@nrwl/linter:eslint",
           "options": {
@@ -885,16 +946,6 @@
               "lib/cli/**/*.html"
             ]
           }
-        },
-        "copydist": {
-          "executor": "nx:run-commands",
-              "options": {
-              "commands": [
-                  {
-                      "command": "cp -R ./lib/cli/dist dist/libs/cli/ && rm -rf ./node_modules/@alfresco/adf-cli/ && mkdir -p ./node_modules/@alfresco/adf-cli/ && cp -R ./dist/libs/cli/* ./node_modules/@alfresco/adf-cli/"
-                  }
-              ]
-          }
         }
       }
     },
diff --git a/scripts/build/build-all-lib.sh b/scripts/build/build-all-lib.sh
index 91a9e8fb8a..c25dbde285 100755
--- a/scripts/build/build-all-lib.sh
+++ b/scripts/build/build-all-lib.sh
@@ -8,7 +8,7 @@ echo "====== Run lib ====="
 
 if [ "$CI" = "true" ]; then
     echo "Building libs for production with NX_FLAG $NX_CALCULATION_FLAGS"
-    NODE_OPTIONS="--max-old-space-size=8192" $(npm bin)/nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell,testing" || exit 1
+    NODE_OPTIONS="--max-old-space-size=8192" $(npm bin)/nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell" || exit 1
 else
     echo "Building libs for development with NX_FLAG $NX_CALCULATION_FLAGS"
     NODE_OPTIONS="--max-old-space-size=8192" $(npm bin)/nx affected:build $NX_CALCULATION_FLAGS --exclude=demoshell || exit 1
@@ -17,5 +17,3 @@ fi
 echo "====== run core ====="
 ./scripts/build/build-core.sh || exit 1
 
-echo "====== Run testing ====="
-./scripts/build/build-testing.sh || exit 1
diff --git a/scripts/build/build-testing.sh b/scripts/build/build-testing.sh
deleted file mode 100755
index 1203568aa7..0000000000
--- a/scripts/build/build-testing.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-cd $DIR/../..
-
-echo "====== Testing ======"
-
-echo "====== Move to node_modules ======"
-nx build testing
-nx run testing:copydist
diff --git a/scripts/ci/job_hooks/before_e2e.sh b/scripts/ci/job_hooks/before_e2e.sh
index 668ae67db1..c4221c0c33 100755
--- a/scripts/ci/job_hooks/before_e2e.sh
+++ b/scripts/ci/job_hooks/before_e2e.sh
@@ -3,15 +3,4 @@
  # Download protractor-smartrunner artifact related to this particular job from S3, if exists
 ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_SMART_RUNNER_PATH/$TRAVIS_JOB_ID.tar.bz2" -o "$SMART_RUNNER_DIRECTORY"
 
-# TODO: This one needs to be cleaned up... Only fixing it like this, because for the current PR it is out of scope
-# =======================================
-rm -rf ./node_modules/@alfresco/adf-cli/ && \
-mkdir -p ./node_modules/@alfresco/adf-cli/ && \
-cp -R ./dist/libs/cli/* ./node_modules/@alfresco/adf-cli/
-
-rm -rf ./node_modules/@alfresco/adf-testing/ && \
-mkdir -p ./node_modules/@alfresco/adf-testing/ && \
-cp -R ./dist/libs/testing/* ./node_modules/@alfresco/adf-testing/
-# =======================================
-
 exit 0
diff --git a/scripts/ci/job_hooks/install.sh b/scripts/ci/job_hooks/install.sh
index e6c7f2d328..3e7b42682a 100755
--- a/scripts/ci/job_hooks/install.sh
+++ b/scripts/ci/job_hooks/install.sh
@@ -1,3 +1,15 @@
 #!/usr/bin/env bash
 
 npm ci
+# the cli/testing need to be always build because they are now installed from NPM!
+# nx build cli
+# nx build testing
+# The adf-cli is not installed through NPM for this reason it needs to be built
+#   in addition the dist folder needs to be moved as part of the node modules
+#   in this way every check like check-cs check-ps can use the adf cli
+#   the bundle is saved under node_modules also to use the same cache of travis
+nx run cli:bundle
+# The adf-testing is not installed through NPM for this reason it needs to be built
+#   in addition the dist folder needs to be moved as part of the node modules
+#   in this way the protractor.config.js can use require('@alfresco/adf-testing');
+nx run testing:bundle