diff --git a/.travis.yml b/.travis.yml
index 0aae63c89a..addc8093f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -225,7 +225,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: $RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/community/RM/${RELEASE_VERSION}"
@@ -246,7 +246,7 @@ jobs:
       deploy:
         - provider: s3
           access_key_id: ${RELEASE_AWS_ACCESS_KEY}
-          secret_access_key: ${RELEASE_AWS_ACCESS_SECRET}
+          secret_access_key: ${RELEASE_AWS_SECRET_KEY}
           region: "eu-west-1"
           bucket: "eu.dl.alfresco.com"
           upload_dir: "release/enterprise/RM/${RELEASE_VERSION}"
diff --git a/scripts/set-release-variables.sh b/scripts/set-release-variables.sh
index 35013b7053..b15b3a59cb 100755
--- a/scripts/set-release-variables.sh
+++ b/scripts/set-release-variables.sh
@@ -2,15 +2,15 @@
 set -e
 
 echo "Travis commit message: $TRAVIS_COMMIT_MESSAGE"
-release_message=$(echo $TRAVIS_COMMIT_MESSAGE | grep -Po '(\[(community|enterprise)\srelease\s(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}\s(\d\.)+\d-SNAPSHOT\])')
+release_message=$(echo "$TRAVIS_COMMIT_MESSAGE" | grep -Po '(\[(community|enterprise)\srelease\s((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}\s((\d)+\.)+(\d)+-SNAPSHOT\])')
 
 if [ ! -n "$release_message" ]; then
   echo "The commit message is in the wrong format or it does not contain all the required properties."
   exit 1
 fi
 
-export RELEASE_VERSION=$(echo $release_message | grep -Po '(\d\.)+(\d|[a-z])(-[A-Z]\d){0,1}' | head -1)
-export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '(\d\.)+\d-SNAPSHOT')
+export RELEASE_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+((\d)+|[a-z])(-[A-Z]\d){0,1}' | head -1)
+export DEVELOPMENT_VERSION=$(echo $release_message | grep -Po '((\d)+\.)+(\d)+-SNAPSHOT')
 
 echo "Release version is set to $RELEASE_VERSION"
 echo "Development version is set to $DEVELOPMENT_VERSION"
\ No newline at end of file