diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 21b4fbf..1b7dd34 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
       run: make test-coverage
 
     - name: Run linter
-      uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
+      uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
       with:
         version: v1.64.8
         only-new-issues: true
diff --git a/.gitignore b/.gitignore
index 1c04b0e..d413a25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ scratch/
 
 # Claude Code
 .claude/
+**/CLAUDE.md
diff --git a/.golangci.yml b/.golangci.yml
index 816f707..3b5dc44 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,11 +3,6 @@
 run:
   timeout: 5m
   tests: true
-  skip-dirs:
-    - vendor
-    - protos/block  # Generated protobuf code
-  skip-files:
-    - ".*\\.pb\\.go$"  # Skip generated protobuf files
 
 linters-settings:
   errcheck:
@@ -15,7 +10,6 @@ linters-settings:
     check-blank: true
 
   govet:
-    check-shadowing: true
     enable-all: true
 
   gofmt:
@@ -62,8 +56,6 @@ linters-settings:
   stylecheck:
     checks: ["all", "-ST1003"]  # Disable underscores in names (we use them for test mocks)
 
-  unused:
-    check-exported: false
 
 linters:
   disable-all: true
@@ -99,6 +91,11 @@ linters:
     - whitespace
 
 issues:
+  exclude-dirs:
+    - vendor
+    - protos/block  # Generated protobuf code
+  exclude-files:
+    - ".*\\.pb\\.go$"  # Skip generated protobuf files
   exclude-rules:
     # Exclude some linters from running on tests files
     - path: _test\.go
@@ -133,8 +130,8 @@ issues:
   new: false
 
 output:
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
   print-issued-lines: true
   print-linter-name: true
-  uniq-by-line: true
   sort-results: true