diff --git a/.travis.yml b/.travis.yml
index 74b18983..31b24f81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ script:
   - make test
 
 after_success:
-  - echo $DOCKER_PASSWORD | docker login -u $DOCKER_USER --password-stdin
+  - echo $DOCKER_PASSWORD | docker login -u $DOCKER_LOGIN --password-stdin
   - export REPO=$DOCKER_USER/tile38
   - export COMMIT_SHORT=$(git rev-parse --short HEAD)
   - docker build -f docker/Dockerfile -t $REPO:$COMMIT_SHORT .
diff --git a/build.sh b/build.sh
index ae7a463a..61ee403c 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+cd $(dirname "${BASH_SOURCE[0]}")
+OD="$(pwd)"
+
 VERSION=$(git describe --tags --abbrev=0)
 PROTECTED_MODE="no"
 
@@ -72,11 +75,6 @@ if [ "$GOVERS" != "devel" ]; then
 	fi
 fi
 
-export GO15VENDOREXPERIMENT=1
-
-cd $(dirname "${BASH_SOURCE[0]}")
-OD="$(pwd)"
-
 package(){
 	echo Packaging $1 Binary
 	bdir=tile38-${VERSION}-$2-$3