diff --git a/Makefile b/Makefile
index fee9b5d..4586975 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ GO_FILES := $(shell find . -name '*.go' | grep -v /vendor/ | grep -v _test.go)
 all: build
 
 lint: ## Lint the files
-	@gocritic check-project $(PACKAGE_PATH)
+	@golangci-lint run
 
 test: ## Run unittests
 	@go test -short ${PACKAGE_LIST}
diff --git a/.gitlab-ci.yml b/build/ci/gitlab-ci.yml
similarity index 71%
rename from .gitlab-ci.yml
rename to build/ci/gitlab-ci.yml
index 1084725..8717aaa 100644
--- a/.gitlab-ci.yml
+++ b/build/ci/gitlab-ci.yml
@@ -12,10 +12,12 @@ stages:
   - test
 
 before_script:
-  - apk add --no-cache git build-base bash
+  - apk add --no-cache git build-base bash make
   - mkdir -p /go/src/gitlab.com/$CI_PROJECT_NAMESPACE /go/src/_/builds
   - cp -r $CI_PROJECT_DIR /go/src/gitlab.com/$CI_PROJECT_PATH
   - ln -s /go/src/gitlab.com/$CI_PROJECT_NAMESPACE /go/src/_/builds/$CI_PROJECT_NAMESPACE
+  - go get github.com/golangci/golangci-lint/cmd/golangci-lint
+  - go install github.com/golangci/golangci-lint/cmd/golangci-lint
   - make dep
 
 unit_tests:
@@ -32,10 +34,10 @@ code_coverage:
   stage: test
   script:
     - make coverage
+  coverage: '/^coverage:\s(\d+(?:\.\d+)?%)/'
 
 lint_code:
-  stage: test
+  stage: review
   script:
-    - go get github.com/go-critic/go-critic/cmd/gocritic
-    - go install github.com/go-critic/go-critic/cmd/gocritic
     - make lint
+  allow_failure: true