diff --git a/.travis.yml b/.travis.yml
index f62422fe..1c3a9eea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,12 +38,12 @@ after_success:
     docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
     export IMAGE=$(docker images | awk '{print $3}' | awk 'NR==2')
     export REPO=$(echo $TRAVIS_REPO_SLUG | sed 's/\/docker-/\//g')
-    if [[ -n "$TRAVIS_TAG" ]] && [[ "$TRAVIS_TAG" =~ [^\$MOLECULE_SCENARIO_NAME] ]]; then
+    if [[ -n "$TRAVIS_TAG" ]] && [[ "$TRAVIS_TAG" =~ ^$MOLECULE_SCENARIO_NAME ]]; then
       docker tag "$IMAGE" "$REPO":"$TRAVIS_TAG"
       docker push "$REPO":"$TRAVIS_TAG"
       docker tag "$IMAGE" "$REPO":latest
       docker push "$REPO":latest
-    elif [[ "$TRAVIS_BRANCH" =~ [^master$] ]]; then
+    elif [[ "$TRAVIS_BRANCH" =~ master ]]; then
       docker tag "$IMAGE" "$REPO":"$MOLECULE_SCENARIO_NAME"
       docker push "$REPO":"$MOLECULE_SCENARIO_NAME"
     fi
diff --git a/roles/bootstrap b/roles/bootstrap
index 71bfc6c1..f0b846c5 160000
--- a/roles/bootstrap
+++ b/roles/bootstrap
@@ -1 +1 @@
-Subproject commit 71bfc6c1fb909d49615bf75675d2c4a256b7d553
+Subproject commit f0b846c54957c12f3e31df9bb57c83caec3739ef