diff --git a/.travis.yml b/.travis.yml
index 7e2b41b8d1..b62336b645 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -89,7 +89,7 @@ jobs:
           script: ./scripts/travis/update/update-children.sh
 
         - stage: Release beta tag
-          script: ./scripts/travis/release/git-tag-beta.sh
+          script: ./scripts/travis/release/git-tag.sh
 
 
         - stage: e2e Test
@@ -126,23 +126,6 @@ jobs:
           name: Update Rancher PR
           script: ./scripts/travis/deploy/deploy.sh
 
-
-before_deploy:
-  if ![[ $TRAVIS_TAG ]]; then
-      git config --local user.name "Alfresco"
-      export TRAVIS_TAG=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
-      echo "Create tag:" $TRAVIS_TAG
-      git tag $TRAVIS_TAG
-  fi
-
-deploy:
-  provider: releases
-  api_key: $GITHUB_TOKEN
-  name: $TRAVIS_TAG
-  body: "Add the release note"
-  on:
-    branch: master
-
 cache:
   directories:
   - node_modules
diff --git a/scripts/travis/release/git-tag-beta.sh b/scripts/travis/release/git-tag.sh
similarity index 65%
rename from scripts/travis/release/git-tag-beta.sh
rename to scripts/travis/release/git-tag.sh
index 33325d5043..9d4dbfd286 100755
--- a/scripts/travis/release/git-tag-beta.sh
+++ b/scripts/travis/release/git-tag.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-VERSION=$(npm view @alfresco/adf-core@beta version)
+if [[  $TRAVIS_BRANCH == "master" ]]; then
+    TAG_VERSION=$(grep -m1 version package.json | awk '{ print $2 }' | sed 's/[", ]//g')
+else
+    TAG_VERSION=$(npm view @alfresco/adf-core@beta version)
+fi;
 
 echo "git tag -a ${VERSION} -m ${VERSION}"
 git config --local user.name "alfresco-build"