diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index deedf4f144da6a4a7d2f579414309e7171587094..99f4b78f49d9b5967da6eaaf0904521a5d22377c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,10 @@ before_script:
   - export GOROOT=${GO_HOME}
   - export GOPATH=${CI_PROJECT_DIR}/_build/go
   - export PATH=${ERL_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:$PATH
+  - export DOCKER_HOST="tcp://127.0.0.1:2375"
   - mkdir -p ${GOPATH}
   - socat tcp-listen:2375,reuseaddr,bind=127.0.0.1,fork unix-connect:/var/run/docker.sock &
-  - sleep 3
-  - export DOCKER_HOST="tcp://127.0.0.1:2375"
-  - docker info
-  - rebar3 update
+  - sleep 2
 
 stages:
   - test
@@ -22,8 +20,9 @@ stages:
 test:
   stage: test
   script:
-    - docker pull hedenstroem/consul:latest
+    - rebar3 update
     - git pull origin master
+    - docker pull hedenstroem/consul:latest
     - FORMAT="compact" ERL_AFLAGS="-args_file config/test-vm.args -config config/test-sys.config" rebar3 as test do eunit --cover --application=consul_proxy --dir=apps/consul_proxy/test, cover --verbose
     - coverage.escript _build/test/cover/eunit.coverdata
 
@@ -33,6 +32,7 @@ build:
     - master
     - production
   script:
+    - rebar3 update
     - rebar3 edoc
     - rebar3 as production do tar
     - relinfo.escript -vsn _build/production/rel/consul_proxy/releases/RELEASES > _build/VERSION