diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f69957c..f082878 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,19 @@
-image: golang:1.6.2
-
 before_script:
-  - export CURRENT_BUILD_PATH=/builds/timothy/godns
+  - export GOPATH=$(pwd)
 
 stages:
   - build
   - test
 
-init-env:
-  stage: init
-  script:
-
 build-my-project:
+  image: go:1.6.2
   stage: build
   script:
-    - cd $CURRENT_BUILD_PATH 
     - go get
     - go build
 
 test-my-project:
+  image: go:1.6.2
   stage: test
   script:
-    - cd $CURRENT_BUILD_PATH
     - go test