diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acd026a23fb0c51fb169096a37b4f7f4d09f2d4a..3ae10077faad18937d15f0287849acaf5d95f086 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,9 @@ image: registry.hedenstroem.com/gitlab/gitlab-builder-go:1.7.3
 before_script:
   - CI_PROJECT_HOST=gitlab.hedenstroem.com
   - git config --global url."git@$CI_PROJECT_HOST:".insteadOf "https://$CI_PROJECT_HOST/"
-  - CI_PROJECT_GOPATH=$GOPATH/src/$CI_PROJECT_HOST/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
-  - mkdir -p $CI_PROJECT_GOPATH
-  - ln -s $CI_PROJECT_DIR $CI_PROJECT_GOPATH
-  - cd $CI_PROJECT_GOPATH
+  - mkdir -p $GOPATH/src/$CI_PROJECT_HOST/$CI_PROJECT_NAMESPACE
+  - ln -s $CI_PROJECT_DIR $GOPATH/src/$CI_PROJECT_HOST/$CI_PROJECT_NAMESPACE
+  - cd $GOPATH/src/$CI_PROJECT_HOST/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
 
 stages:
   - build
@@ -18,6 +17,7 @@ go build:
   only:
     - master
   script:
+    - go get -v -d ./...
     - CGO_ENABLED=0 go build -tags netgo --ldflags '-extldflags "-static"' ./cmd/genpasswd
     - CGO_ENABLED=0 go build -tags netgo --ldflags '-extldflags "-static"' ./cmd/consul-backup
   artifacts: