diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 232d63695..b1f2f026b 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -13,15 +13,12 @@ jobs:
     name: Lint Server
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Run golangci-lint
-        uses: actions-contrib/golangci-lint@v1
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v0.1.7
         with:
-          golangci_lint_version: v1.25.0
-#          TODO Enable github actions output format: https://github.com/actions-contrib/golangci-lint/issues/11
-#          args: run --out-format github-actions
+          version: v1.26
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
   go:
     name: Test Server on ${{ matrix.os }}
diff --git a/Makefile b/Makefile
index 334210325..ab2b6c788 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ setup-dev: setup
 	@which ginkgo        || (echo "Installing Ginkgo"        && GO111MODULE=off go get -u github.com/onsi/ginkgo/ginkgo)
 	@which goose         || (echo "Installing Goose"         && GO111MODULE=off go get -u github.com/pressly/goose/cmd/goose)
 	@which reflex        || (echo "Installing Reflex"        && GO111MODULE=off go get -u github.com/cespare/reflex)
-	@which golangci-lint || (echo "Installing GolangCI-Lint" && GO111MODULE=off go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.0)
+	@which golangci-lint || (echo "Installing GolangCI-Lint" && cd ..&& GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.26.0)
 	@which lefthook      || (echo "Installing Lefthook"      && GO111MODULE=off go get -u github.com/Arkweid/lefthook)
 	@lefthook install
 .PHONY: setup