diff --git a/builder/image-build.sh b/builder/image-build.sh
index c879a7f..beea361 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -79,9 +79,11 @@ img-resize ${IMAGE_PATH} max '5G'
 # Checkout to tag's branch if built with travis tag
 if [[ ! -z ${TRAVIS_TAG} ]]; then
   cd ${REPO_DIR}
-  echo_stamp "Checkout to origin/pinocchio_work from ${TRAVIS_TAG}" "INFO"
+  echo_stamp "Checkout to master from ${TRAVIS_TAG}" "INFO"
   git fetch
   git checkout --track origin/pinocchio_work
+  git checkout master
+  git checkout pinocchio_work -- Drone/client_config.ini
   cd /
 fi