diff --git a/.golangci.yml b/.golangci.yml
index 3046f2ac7..38aee5a42 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -18,5 +18,6 @@ run:
   deadline: 2m
   skip-dirs:
     - integration
+    - pkg/api
   skip-files:
-    - ".*_test.go" 
+    - ".*_test.go"
diff --git a/Makefile b/Makefile
index 5dbfc819d..8545fa1f8 100644
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,10 @@ install.tools: .install.gitvalidation .install.golangci-lint .install.vndr ## in
 
 .install.golangci-lint:
 	@echo "$(WHALE) $@"
-	$(GO) get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+	$(GO) get -d github.com/golangci/golangci-lint/cmd/golangci-lint
+	@cd $(GOPATH)/src/github.com/golangci/golangci-lint/cmd/golangci-lint; \
+		git checkout v1.18.0; \
+		go install
 
 .install.vndr:
 	@echo "$(WHALE) $@"