diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5dd29fc90..2e4d4c17d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,7 +48,11 @@ jobs:
       - run: make test-unit
   # It's recommended to run golangci-lint in a job separate from other jobs (go test, etc) because different jobs run in parallel.
   go-linter:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest]
+    name: lint
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
diff --git a/Makefile b/Makefile
index 1c33db519..5f6d5098f 100644
--- a/Makefile
+++ b/Makefile
@@ -355,7 +355,8 @@ gen-code:
 .PHONY: lint
 # To run golangci-lint locally: https://golangci-lint.run/usage/install/#local-installation
 lint:
-	golangci-lint run
+	env GOOS=windows golangci-lint run
+	env GOOS=darwin golangci-lint run
 
 .PHONY: mdlint
 # Install it locally: https://github.com/igorshubovych/markdownlint-cli#installation