diff --git a/.travis.yml b/.travis.yml
index 19d1a69808..e75bb0a3ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -109,6 +109,8 @@ jobs:
           name:  "Lib::Build"
           script:
             - nx affected:build $NX_CALCULATION_FLAGS --prod --exclude="demoshell"
+            - ./scripts/travis/build/bumpversion.sh || travis_terminate 1
+
           workspaces:
             create:
               name: built_libs_cache
@@ -173,7 +175,6 @@ jobs:
         - stage: "Release"
           name:  "release::npm"
           script:
-            - ./scripts/travis/release/prepublish.sh || travis_terminate 1
             - ./scripts/travis/release/release-npm.sh || travis_terminate 1
           workspaces:
             use: built_libs_cache
diff --git a/angular.json b/angular.json
index af94583e50..a427b130ce 100644
--- a/angular.json
+++ b/angular.json
@@ -300,7 +300,7 @@
       "sourceRoot": "lib/core/src",
       "prefix": "adf",
       "architect": {
-        "build": {
+        "build-lib": {
           "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "lib/core/tsconfig.lib.json",
diff --git a/lib/cli/scripts/npm-publish.ts b/lib/cli/scripts/npm-publish.ts
index 61dfdc7766..6701e1948f 100644
--- a/lib/cli/scripts/npm-publish.ts
+++ b/lib/cli/scripts/npm-publish.ts
@@ -71,7 +71,7 @@ async function npmPublish(args: PublishArgs, project: string) {
 }
 
 function npmCheckExist(project: string, version: string) {
-    logger.info(`Check if lib  ${project} is already in npm`);
+    logger.info(`Check if lib  ${project} is already in npm with version ${version}`);
 
     const exist = exec(`npm`, [`view`, `@alfresco/adf-${project}@${version} version`]  );
 
diff --git a/lib/core/package.json b/lib/core/package.json
index f0260c577f..46629aaa63 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -10,6 +10,10 @@
   "bugs": {
     "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
   },
+  "scripts": {
+    "build": "nx run core:build-lib",
+    "postbuild": "nx run core:pretheme"
+  },
   "exports": {
     "./theming": {
       "sass": "./lib/theming/_index.scss"
diff --git a/scripts/next_version.sh b/scripts/next_version.sh
index 5b23176c70..e92ea04b8a 100755
--- a/scripts/next_version.sh
+++ b/scripts/next_version.sh
@@ -83,6 +83,7 @@ fi
 if [[ "${EXEC_ALPHA}" == true ]]
 then
     NEXT_VERSION=${NEXT_VERSION}-${TRAVIS_BUILD_NUMBER}
+    echo "version "$NEXT_VERSION
 fi
 
 if [[ "${EXEC_BETA}" == true ]]
diff --git a/scripts/travis/build/bumpversion.sh b/scripts/travis/build/bumpversion.sh
new file mode 100755
index 0000000000..aba1c3eccb
--- /dev/null
+++ b/scripts/travis/build/bumpversion.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+cd $DIR/../../../
+
+if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ ]]
+then
+    echo "Replace NPM version with new Alpha tag"
+    NEXT_VERSION=-nextalpha
+    ./scripts/update-version.sh -gnu $NEXT_VERSION || exit 1;
+fi
+
+
diff --git a/scripts/travis/release/prepublish.sh b/scripts/travis/release/prepublish.sh
deleted file mode 100755
index f7abd82c05..0000000000
--- a/scripts/travis/release/prepublish.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-cd $DIR/../../../
-
-if [[ $TRAVIS_BRANCH =~ ^develop(-patch.*)?$ ]]
-then
-    isSameADFSha=$(node ./scripts/travis/update/adf-same-commit-verify.js --token=$TOKEN --head=$BRANCH_TO_CREATE --repo=$NAME_REPO --commit=$COMMIT )
-    if [ "$isSameADFSha" = 'true' ]; then
-            echo 'ADF sha is the same. No need to publish again on NPM'
-        else
-            echo "Replace NPM version with new Alpha tag"
-            NEXT_VERSION=-nextalpha
-            ./scripts/update-version.sh -gnu $NEXT_VERSION || exit 1;
-    fi
-fi
-
-node ./scripts/pre-publish.js
-
-echo "====== Prebuilt Themes ====="
-nx affected $NX_CALCULATION_FLAGS --target=pretheme
-