diff --git a/.travis.yml b/.travis.yml
index a8567cb0e5..8e808377b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -111,7 +111,7 @@ jobs:
 
     - name: "Community Release"
         stage: Release
-        if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ /\[.*release .*\]/
+        if: fork = false AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND commit_message =~ ^\[.*community release.*\]$
         before_script:
           bash scripts/set-release-variables.sh
         script:
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index a21b74de9d..b61e123e56 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -7,7 +7,7 @@ if [ ! -n "$release_message" ]; then
   exit 0
 fi
 
-export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])')
+export RELEASE_VERSION=$(echo $release_message | ggrep -Po '\g<1>(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}')
 export DEVELOPMENT_VERSION=$(echo $release_message | ggrep -Po '(\d\.)+\d-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
@@ -20,7 +20,7 @@ if [[ $release_type =~ "community" ]]; then
   if [[ $release_type =~ "internal" ]]; then
     echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release"
     export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging"
-    export ARTIFACTS_UPLOAD_DIR="community/alfresco-governance-services/release/${TRAVIS_BRANCH}"
+    export ARTIFACTS_UPLOAD_DIR="community/RM/${RELEASE_VERSION}"
   else
     echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release"
     export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com"
@@ -31,7 +31,7 @@ elif [[ $release_type =~ "enterprise" ]]; then
   if [[ $release_type =~ "internal" ]]; then
     echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the Internal release"
     export ARTIFACTS_UPLOAD_BUCKET="alfresco-artefacts-staging"
-    export ARTIFACTS_UPLOAD_DIR="enterprise/alfresco-governance-services/release/${TRAVIS_BRANCH}"
+    export ARTIFACTS_UPLOAD_DIR="enterprise/RM/${RELEASE_VERSION}"
   else
     echo "Setting ARTIFACTS_UPLOAD_BUCKET and ARTIFACTS_UPLOAD_DIR for the release"
     export ARTIFACTS_UPLOAD_BUCKET="eu.dl.alfresco.com"
diff --git a/travis-env-vars.yml b/travis-env-vars.yml
index fdb8385892..3f2b6d8705 100644
--- a/travis-env-vars.yml
+++ b/travis-env-vars.yml
@@ -3,6 +3,4 @@ env:
     - AUTOMATION_COMMUNITY_PATH=rm-automation/rm-automation-community-rest-api
     - AUTOMATION_ENTERPRISE_PATH=rm-automation/rm-automation-enterprise-rest-api
     - AUTOMATION_UI_PATH=rm-automation/rm-automation-ui
-    - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin
-    - GIT_COMMITTER_NAME=alfresco-build
-    - GIT_COMMITTER_EMAIL=info@alfresco.com
\ No newline at end of file
+    - S3_INSTALLER_PATH=/eu.dl.alfresco.com/release/enterprise/5.2/5.2.7/5.2.7.4/alfresco-content-services-installer-5.2.7.4-linux-x64.bin
\ No newline at end of file