diff --git a/scripts/npm-publish.sh b/scripts/npm-publish.sh
index 6a7f96f4f2..fe10c3f3c8 100755
--- a/scripts/npm-publish.sh
+++ b/scripts/npm-publish.sh
@@ -56,7 +56,7 @@ add_tag(){
     fi
 
     echo "====== TAG WILL BE ADDED DURING THE PUBLISH: ${TAG} ====="
-    OPTIONS="$OPTIONS -tag $1"
+    OPTIONS="$OPTIONS --tag $1"
 }
 
 change_registry(){
diff --git a/scripts/update-version.sh b/scripts/update-version.sh
index c9417b29e6..d4cc32af47 100755
--- a/scripts/update-version.sh
+++ b/scripts/update-version.sh
@@ -1,12 +1,38 @@
 #!/usr/bin/env bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+eval JS_API=true
 
 set -ex
 
 cd `dirname $0`
 
-VERSION=$1
+show_help() {
+    echo "Usage: update-version.sh"
+    echo ""
+    echo "-sj or -sjsapi  don't update js-api version"
+    echo "-v or -version  version to update"
+}
+
+skip_js() {
+    echo "====== Skip JS-API change version $1 ====="
+    JS_API=false
+}
+
+version_change() {
+    echo "====== New version $1 ====="
+    VERSION=$1
+}
+
+while [[ $1  == -* ]]; do
+    case "$1" in
+      -h|--help|-\?) show_help; exit 0;;
+      -v|version) version_change $2; shift 2;;
+      -sj|sjsapi) skip_js; shift;;
+      -*) shift;;
+    esac
+done
+
 
 if [[ "${VERSION}" == "" ]]
 then
@@ -30,14 +56,22 @@ for PACKAGE in \
   ng2-alfresco-viewer \
   ng2-alfresco-webscript \
   ng2-alfresco-userinfo \
-  ng2-alfresco-social \
-  alfresco-js-api
+  ng2-alfresco-social
 do
-  DESTDIR="$DIR/../ng2-components/${PACKAGE}"
   echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======"
   find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"${VERSION}\"/g"
 done
 
+
+if $JS_API == true; then
+    for PACKAGE in \
+      alfresco-js-api
+    do
+      echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======"
+      find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"${VERSION}\"/g"
+    done
+fi
+
 for PACKAGE in \
   ng2-activiti-diagrams \
   ng2-activiti-analytics \
@@ -81,14 +115,24 @@ for PACKAGE in \
   ng2-alfresco-viewer \
   ng2-alfresco-webscript \
   ng2-alfresco-userinfo \
-  ng2-alfresco-social \
-  alfresco-js-api
+  ng2-alfresco-social
 do
   DESTDIR="$DIR/../ng2-components/${PACKAGE}"
   echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ~${VERSION} version in all the package.json ======"
   find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"~${VERSION}\"/g"
 done
 
+
+if $JS_API == true; then
+    for PACKAGE in \
+      alfresco-js-api
+    do
+        DESTDIR="$DIR/../ng2-components/${PACKAGE}"
+        echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ~${VERSION} version in all the package.json ======"
+        find ././../ -type f -maxdepth 4 -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGE}\": \"~${VERSION}\"/g"
+    done
+fi
+
 for PACKAGE in \
   ng2-activiti-diagrams \
   ng2-activiti-analytics \