diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97143c487a6cb8aba5dccdaffc1bdb2b43a5b3f5..dce537b1e4581b5cda47294fea79b64c92bcbbff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: golang:latest
+image: containers.ethitter.com:443/docker/images/golang:latest
 
 variables:
   REPO_NAME: git.ethitter.com/debian/eth-log-alerting
@@ -20,6 +20,8 @@ before_script:
   - cp -R $CI_PROJECT_DIR $GOPATH/src/$REPO_NAME
   - cd $GOPATH/src/$REPO_NAME
 
+  - export CC=clang-5.0
+
   - make dep
 
 unit_tests:
diff --git a/Makefile b/Makefile
index d4b48867910a93eb99e6a34d98bd95f142f1cbc3..3a0e114fe0518bc14cc9774bdea0ac6d33bbbffd 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ coverhtml:
 
 dep:
 	@go get -v -d ./...
-	@go get -u github.com/golang/lint/golint
 	@go get github.com/mitchellh/gox
 
 build: dep