diff --git a/.golangci.yml b/.golangci.yml
index abdbf3ea..8f661583 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -10,4 +10,4 @@ linters:
     - gocritic
     - deadcode
     - misspell
-    - golint
+    - revive
diff --git a/Makefile b/Makefile
index 46e46ab0..da0337c7 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ GOPATH ?= $(shell go env GOPATH)
 
 BINARY_NAME := crc-admin-helper
 RELEASE_DIR ?= release
+GOLANGCI_LINT_VERSION = v1.41.1
 
 LDFLAGS := -X github.com/code-ready/admin-helper/pkg/constants.Version=$(VERSION) -extldflags='-static' -s -w $(GO_LDFLAGS)
 
@@ -27,6 +28,12 @@ clean:
 	rm -fr release
 	rm -fr crc-admin-helper.spec
 
+.PHONY: golangci-lint
+golangci-lint:
+	@if $(GOPATH)/bin/golangci-lint version 2>&1 | grep -vq $(GOLANGCI_LINT_VERSION); then\
+		pushd /tmp && GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) && popd; \
+	fi
+
 $(BUILD_DIR)/macos-amd64/$(BINARY_NAME):
 	CGO_ENABLED=0 GOARCH=amd64 GOOS=darwin go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/macos-amd64/$(BINARY_NAME) $(GO_BUILDFLAGS) ./cmd/admin-helper/
 
@@ -52,8 +59,8 @@ build:
 	CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BINARY_NAME) $(GO_BUILDFLAGS) ./cmd/admin-helper/
 
 .PHONY: lint
-lint:
-	golangci-lint run
+lint: golangci-lint
+	$(GOPATH)/bin/golangci-lint run
 
 .PHONY: test
 test: