diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 492104fbf3..18484c83e3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,4 +12,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: build and test
-        run: make docker_tests
\ No newline at end of file
+        run: make docker_tests
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
new file mode 100644
index 0000000000..3d7bf85db2
--- /dev/null
+++ b/.github/workflows/golangci-lint.yaml
@@ -0,0 +1,38 @@
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - 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: v1.29
+
+          # 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
diff --git a/.golangci.yml b/.golangci.yml
deleted file mode 100644
index f20905cddf..0000000000
--- a/.golangci.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-run:
-  timeout: 10m
-
-linters:
-  enable:
-  - bodyclose
-  - gofmt
-  - goimports
-  - golint
-  - gosec
-  - misspell
-  - revive
-  - unconvert
-  - unparam
-
-linters-settings:
-  misspell:
-    locale: US
-  gofmt:
-    simplify: true
-  unparam:
-    check-exported: false
-  goimports:
-    local-prefixes: github.com/envoyproxy/go-control-plane
-
-issues:
-  exclude:
-  exclude-rules:
-  - text: "SA1019: package github.com/golang/protobuf/jsonpb is deprecated"
-    linters:
-    - staticcheck
-  - text: "SA1019: package github.com/golang/protobuf/proto is deprecated"
-    linters:
-    - staticcheck
-  - text: "SA1019: proto.MessageName is deprecated"
-    linters:
-    - staticcheck