diff --git a/.travis.yml b/.travis.yml
index 89f501a413..6014e8b3f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,9 +21,7 @@ branches:
   - /.*greenkeeper.*/
 
 stages:
-  - name: Lint & Build Dist
-  - name: Npm Release
-    if: (type = push OR type = cron) AND tag IS blank
+  - name: Lint & Build Dist & Release
   - name: Update Rancher
     if: (type = push AND tag IS blank)  OR type = api
   - name: Deploy PR
@@ -53,22 +51,16 @@ services:
 jobs:
     include:
         # Run Only for any PR
-        - stage: Lint & Build Dist
+        - stage: Lint & Build Dist & Release
           name:  Build
           script:
             - ./scripts/travis/build/build.sh
             - ./scripts/lint.sh
+            - ./scripts/travis/release/release-npm.sh
           after_success:
             - ./scripts/ci/utils/artifact-to-s3.sh -a ./dist/demo-shell -o "$S3_DBP_FOLDER/alfresco-demoshell.tar.bz2"
             - ./scripts/ci/utils/artifact-to-s3.sh -a ./lib/dist -o "$S3_DBP_FOLDER/alfresco-libs.tar.bz2"
 
-        # Run Only on develop and master
-        - stage: Npm Release
-          name: Npm Release
-          before_script: ./scripts/ci/utils/artifact-from-s3.sh -a "$S3_DBP_FOLDER/alfresco-libs.tar.bz2" -o "./lib/dist"
-          script:
-            - ./scripts/travis/release/release-npm.sh
-
         - stage: Unit test
           name: Unit test content
           script:  ./scripts/travis/unit-test/content.sh
diff --git a/package.json b/package.json
index 4c17088be0..13607d4cb7 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
     "01": "echo -------------------------------------------- Build Lib  -----------------------------------------------",
     "01s": "",
     "unit-test": "concurrently \"ng test content-services --watch=false\" \"ng test process-services --watch=false\" \"ng test core --watch=false\" \"ng test extensions --watch=false\" \"ng test insights --watch=false\" \"ng test process-services-cloud --watch=false\" ",
-    "prepublishOnly": "npm run build-lib",
     "build-lib": "./scripts/build/build-all-lib.sh",
     "affected:libs": "nx affected:libs",
     "inspect.bundle": "ng build demoshell --prod --stats-json && npx webpack-bundle-analyzer dist/demo-shell/stats-es2015.json",
diff --git a/scripts/test-dist.sh b/scripts/test-dist.sh
deleted file mode 100755
index bd7c1de71f..0000000000
--- a/scripts/test-dist.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-eval NAME=
-
-show_help() {
-    echo "Usage: test-dist.sh"
-    echo ""
-    echo "-n or --name pr name"
-}
-
-name(){
-    NAME="/$1"
-}
-
-while [[ $1 == -* ]]; do
-    case "$1" in
-      -h|--help|-\?) show_help; exit 0;;
-      -n|--name)  name $2; shift 2;;
-      -*) echo "invalid option: $1" 1>&2; show_help; exit 0;;
-    esac
-done
-
-echo "====== Install lib ===== "
-
-cd $DIR/../
-npm install
-
-echo "====== Install JS-API alpha ===== "
-
-npm install alfresco-js-api@alpha
-
-echo "====== Build ADF ===== "
-
-npm run build-lib || exit 1
-
-echo "====== Build dist demo shell ===== "
-
-npm run server-versions
-ng build dist --base-href=$NAME/ --output-path dist/demo-shell/$NAME || exit 1
-
-echo "====== e2e test ===== "
-
-npm run e2e || exit 1
diff --git a/scripts/travis/build/build.sh b/scripts/travis/build/build.sh
index 719d461960..d5f1b56abe 100755
--- a/scripts/travis/build/build.sh
+++ b/scripts/travis/build/build.sh
@@ -24,8 +24,7 @@ then
 
     npm install
 
-    nx affected --exclude=cli --target=build --all  || exit 1;
-    ./scripts/build/build-cli.sh || exit 1;
+    ./scripts/build/build-all-lib.sh
 else
     echo "====== Update the package.json with latest JS-API/CLI deps ====="
     npx @alfresco/adf-cli@alpha update-version --alpha --pathPackage "$(pwd)"
diff --git a/scripts/travis/release/release-npm.sh b/scripts/travis/release/release-npm.sh
index 933a232192..8305411a6a 100755
--- a/scripts/travis/release/release-npm.sh
+++ b/scripts/travis/release/release-npm.sh
@@ -15,7 +15,9 @@ then
             TAG_NPM=beta
         fi
     fi
-fi;
 
-echo "Publishing on npm with tag $TAG_NPM"
-npx @alfresco/adf-cli npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)"
+    echo "Publishing on npm with tag $TAG_NPM"
+    npx @alfresco/adf-cli npm-publish --npmRegistry $NPM_REGISTRY_ADDRESS --tokenRegistry $NPM_REGISTRY_TOKEN --tag $TAG_NPM --pathProject "$(pwd)"
+else
+     echo "PR Not need to release in NPM"
+fi;