diff --git a/.github/workflows/continuous_delivery.yaml b/.github/workflows/continuous_delivery.yaml
index cfcf7f7d9c3b9195285e1938e68a45c03c103845..787c912a7643e69b8adff1d861632e628810a35b 100644
--- a/.github/workflows/continuous_delivery.yaml
+++ b/.github/workflows/continuous_delivery.yaml
@@ -32,9 +32,6 @@ jobs:
     - name: Build docker image
       run: make image
 
-    - name: Lint
-      run: make lint
-
     - name: Test
       run: git show --stat && make testci
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8182c68d58091a5b319d9fb93e531a98823598dc
--- /dev/null
+++ b/.github/workflows/lint.yaml
@@ -0,0 +1,18 @@
+name: Lint
+
+on:
+  push:
+    branches: [master] # pushes TO master
+  pull_request:
+    branches: [master] # pull requests AGAINST master
+
+jobs:
+  golangci:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.39.0
diff --git a/.golangci.yaml b/.golangci.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3ed85627cd7a384e72cac481b78781f871872c46
--- /dev/null
+++ b/.golangci.yaml
@@ -0,0 +1,6 @@
+run:
+  modules-download-mode: readonly
+
+linters:
+  disable:
+  - errcheck