diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
new file mode 100644
index 000000000..d4eac0d32
--- /dev/null
+++ b/.github/workflows/golangci-lint.yml
@@ -0,0 +1,35 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  schedule:
+    # Trigger every day at 16:00 UTC
+    - cron:  '0 16 * * *'
+jobs:
+  golangci-pr:
+    if: github.ref != 'refs/heads/master'
+    name: lint-pr-changes
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.42.1
+          only-new-issues: true
+  golangci-master:
+    if: github.ref == 'refs/heads/master'
+    name: lint-master-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.42.1
+          only-new-issues: true
+          args: --issues-exit-code=0
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 21cdd54d7..8ba9ae294 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -56,4 +56,3 @@ jobs:
           LINTER_RULES_PATH: '.'
           MARKDOWN_CONFIG_FILE: .markdownlint.yml
           VALIDATE_MARKDOWN: true
-          VALIDATE_GO: true
diff --git a/README.md b/README.md
index d1f5908a9..122b20839 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 
 [![Circle CI](https://circleci.com/gh/influxdata/telegraf.svg?style=svg)](https://circleci.com/gh/influxdata/telegraf) [![Docker pulls](https://img.shields.io/docker/pulls/library/telegraf.svg)](https://hub.docker.com/_/telegraf/)
 [![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://www.influxdata.com/slack)
-[![GitHub Super-Linter](https://github.com/influxdata/telegraf/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter)
 
 Telegraf is an agent for collecting, processing, aggregating, and writing metrics. Based on a
 plugin system to enable developers in the community to easily add support for additional