diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a205981912b2..09daa1b4d91a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v2.1.4
         with:
-          go-version: 1.16
+          go-version: 1.17
       - uses: technote-space/get-diff-action@v5
         id: git_diff
         with:
@@ -22,6 +22,10 @@ jobs:
             **/**.go
             go.mod
             go.sum
-      - name: run go linters
-        run: make lint-go
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+          args: --out-format=tab
+          skip-go-installation: true
         if: env.GIT_DIFF
diff --git a/Makefile b/Makefile
index dadbf36df299..f19650b347a9 100644
--- a/Makefile
+++ b/Makefile
@@ -344,7 +344,7 @@ markdownLintImage=tmknom/markdownlint
 containerMarkdownLint=$(PROJECT_NAME)-markdownlint
 containerMarkdownLintFix=$(PROJECT_NAME)-markdownlint-fix
 
-golangci_lint_cmd=go run github.com/golangci/golangci-lint/cmd/golangci-lint
+golangci_lint_cmd=golangci-lint
 
 lint: lint-go
 	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerMarkdownLint}$$"; then docker start -a $(containerMarkdownLint); else docker run --name $(containerMarkdownLint) -i -v "$(CURDIR):/work" $(markdownLintImage); fi
@@ -354,7 +354,7 @@ lint-fix:
 	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerMarkdownLintFix}$$"; then docker start -a $(containerMarkdownLintFix); else docker run --name $(containerMarkdownLintFix) -i -v "$(CURDIR):/work" $(markdownLintImage) . --fix; fi
 
 lint-go:
-	echo $(GIT_DIFF)
+	@@test -n "$$golangci-lint version | awk '$4 >= 1.42')"
 	$(golangci_lint_cmd) run --out-format=tab $(GIT_DIFF)
 
 .PHONY: lint lint-fix