diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ac1494..9ba0daa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,6 +49,11 @@ jobs:
           command: |
             if [[ "${CIRCLE_BRANCH}" == "master" && -z "${CIRCLE_PR_REPONAME}" ]]; then
               printenv DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
+
+              git config --global user.email "ci@fnproject.com"
+              git config --global user.name "CI"
+              git branch --set-upstream-to=origin/${CIRCLE_BRANCH} ${CIRCLE_BRANCH}
+
               ./build-images.sh 3.6
               ./build-images.sh 3.7.1
               ./release.sh
diff --git a/fdk/version.py b/fdk/version.py
index f6816e0..8d91de2 100644
--- a/fdk/version.py
+++ b/fdk/version.py
@@ -1 +1 @@
-VERSION = "0.1.6"
+VERSION = "0.1.7"
diff --git a/release.sh b/release.sh
index 5092892..60dc644 100755
--- a/release.sh
+++ b/release.sh
@@ -22,12 +22,12 @@ echo "New version: $new_version"
 
 echo "VERSION = '${new_version}'" > fdk/version.py
 
-PBR_VERSION=${new_version} python setup.py sdist bdist_wheel
-twine upload -u ${FN_PYPI_USER} -p ${FN_PYPI_PSWD} dist/fdk-${new_version}*
-
 tag="$new_version"
 git add -u
 git commit -m "FDK Python: $new_version release [skip ci]"
 git tag -f -a $tag -m "version $new_version"
 git push
 git push origin $tag
+
+PBR_VERSION=${new_version} python setup.py sdist bdist_wheel
+twine upload -u ${FN_PYPI_USER} -p ${FN_PYPI_PSWD} dist/fdk-${new_version}*