diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c55e0c35c49f4fcb76cf84c4abaa3565928b9a0..0c32b9585d8df7b55758be9f61a162b4d8889fb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,30 +3,29 @@ image: registry.hedenstroem.com/gitlab/gitlab-builder-go:1.7.1
 before_script:
   - export GOPATH=${CI_PROJECT_DIR}/go
   - export GOBIN=${GOPATH}/bin
-  - export PATH=${GOPATH}/bin:${GOROOT}/bin:$PATH
+  - export PATH=${GOBIN}:$PATH
 
 stages:
   - build
   - deploy
   - trigger
 
-compile:
+go get:
   stage: build
   only:
     - master
   script:
-    - go get ./...
+    - go get ./cmd/...
   artifacts:
     paths:
       - go/bin/
 
-aws_s3:
+upload to aws:
   stage: deploy
   only:
     - master
   script:
-    - aws s3 cp go/bin/genpasswd s3://s3.erlang.ninja/consul_proxy/extras/genpasswd
-    - aws s3 cp go/bin/consul-backup s3://s3.erlang.ninja/consul_proxy/extras/consul-backup
+    - aws s3 cp go/bin s3://s3.erlang.ninja/consul_proxy/extras/ --recursive
 
 trigger:
   stage: trigger