diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 236a703..558e0e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,5 @@
 before_script:
-  - mkdir -p /tmp/gitlabrunner/gogronkh
-  - mv $(pwd)/* /tmp/gitlabrunner/gogronkh
-  - mkdir -p $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
-  - mv /tmp/gitlabrunner/gogronkh/* $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
-  - rm -rf /tmp/gitlabrunner/gogronkh
   - export GOPATH=$(pwd)/goenv
-  - cd $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
 
 stages:
   - dependencies
@@ -15,6 +9,12 @@ stages:
 dependencies:
   stage: dependencies
   script:
+    - mkdir -p /tmp/gitlabrunner/gogronkh
+    - mv $(pwd)/* /tmp/gitlabrunner/gogronkh
+    - mkdir -p $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
+    - mv /tmp/gitlabrunner/gogronkh/* $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
+    - rm -rf /tmp/gitlabrunner/gogronkh
+    - cd $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
     - go get github.com/jinzhu/gorm
     - go get github.com/lib/pq
     - go get github.com/ChannelMeter/iso8601duration
@@ -27,6 +27,7 @@ dependencies:
 buildLibs:
   stage: libs
   script:
+    - cd $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
     - go tool vet -composites=false -shadow=true ./config
     - go build ./config
     - go tool vet -composites=false -shadow=true ./database
@@ -39,11 +40,13 @@ buildLibs:
 parser:
   stage: build
   script:
+    - cd $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
     - go tool vet -composites=false -shadow=true ./gparser
     - go build ./gparser
 
 server:
   stage: build
   script:
+    - cd $(pwd)/goenv/src/git.1750studios.com/gronkhDE/gogronkh
     - go tool vet -composites=false -shadow=true ./gserver
     - go build ./gserver