diff --git a/bitnami/owncloud/circle.yml b/bitnami/owncloud/circle.yml
index 163c551f867a..895bc4b54960 100644
--- a/bitnami/owncloud/circle.yml
+++ b/bitnami/owncloud/circle.yml
@@ -21,16 +21,16 @@ deployment:
     branch: master
     commands:
     - >
-      if [ -n $DOCKER_PASS ]; then
+      if [ -n "$DOCKER_PASS" ]; then
         docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
         docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:_ .
         docker push $DOCKER_PROJECT/$IMAGE_NAME:_
       fi
   release:
-    tag: /^[0-9].*/
+    tag: /^[0-9].*-r[0-9]+$/
     commands:
     - >
-      if [ -n $DOCKER_PASS ]; then
+      if [ -n "$DOCKER_PASS" ]; then
         docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
         docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG .
         docker tag $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_TAG $DOCKER_PROJECT/$IMAGE_NAME:latest
@@ -38,7 +38,7 @@ deployment:
         docker push $DOCKER_PROJECT/$IMAGE_NAME:latest
       fi
     - >
-      if [ -n $GCLOUD_SERVICE_KEY ]; then
+      if [ -n "$GCLOUD_SERVICE_KEY" ]; then
         echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
         gcloud auth activate-service-account --key-file ${HOME}/gcloud-service-key.json
         echo 'ENV BITNAMI_CONTAINER_ORIGIN=GCR' >> Dockerfile