diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 650ee12b2..8bb38ed33 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -60,10 +60,3 @@ jobs:
           path: bin/gomplate.exe
       - run: make test
       - run: make integration
-  lint:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/hairyhenderson/gomplate-ci-build:latest
-    steps:
-      - uses: actions/checkout@v3
-      - run: make ci-lint
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..d8ae5c68f
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,26 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v3
+        with:
+          # Use 1.18 rather than 1.19 for linting due to https://github.com/golangci/golangci-lint/issues/2374
+          go-version: 1.18
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          args: --max-same-issues=0 --max-issues-per-linter=0
+