diff --git a/Jenkinsfile b/Jenkinsfile
index b640ed376e..f24661af78 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -128,7 +128,7 @@ pipeline {
                                         checkout scm;
 
                                         if (new_tag) {
-                                            sh "git tag ${new_tag}"
+                                            sh "git tag ${new_tag} || true"
                                         }
                                     }
 
diff --git a/deploy/platform/bootstrap/bootstrap_build.sh b/deploy/platform/bootstrap/bootstrap_build.sh
index a8ef7d840c..ec2493dbed 100755
--- a/deploy/platform/bootstrap/bootstrap_build.sh
+++ b/deploy/platform/bootstrap/bootstrap_build.sh
@@ -14,6 +14,7 @@ trap cleanup EXIT INT
 docker run -t -a stdout -a stderr --cidfile=$cid \
    -u $(id -u):$(id -g) --privileged \
    -e "HOME=/tmp" \
+   -e "BRANCH" \
    -e "RELEASE_VERSION" \
    -v "${SRCDIR}:${DOCKER_SRCDIR}" \
    ${DOCKERIMAGE} "${DOCKER_SRCDIR}/bootstrap"