diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f547d61d..46b72c9b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,10 +25,34 @@ jobs:
         name: Install Deps
         id: install-deps
         run: sudo apt-get -y install libpcsclite-dev
+      -
+        name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          version: 'latest'
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true then the action will use pre-installed Go.
+          # skip-go-installation: true
+
+          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true
       -
         name: Lint, Test, Build
         id: lint_test_build
-        run: V=1 make -j1 bootstrap ci
+        run: V=1 make ci
 
   create_release:
     name: Create Release
diff --git a/Makefile b/Makefile
index 79a31eba..396d0a5f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ OUTPUT_ROOT=output/
 
 all: lint test build
 
-ci: lintcgo testcgo build
+ci: testcgo build
 
 .PHONY: all ci
 
@@ -28,7 +28,7 @@ ci: lintcgo testcgo build
 
 bootstra%:
 	# Using a released version of golangci-lint to take into account custom replacements in their go.mod
-	$Q go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.24.0
+	$Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.39.0
 
 .PHONY: bootstra%