diff --git a/.golangci.yml b/.golangci.yml
index 9306540caf..54d9449bf0 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -7,7 +7,11 @@ issues:
     - testdata$
     - test/mock
   exclude-files:
-    - ".*\\.pb\\.go"
+    - ".*\\.pb\\.go$"
+  exclude-rules:
+    - linters: [ staticcheck ]
+      path: ".*_test\\.go$"
+      text: "Subjects has been deprecated since Go 1\\.18.*Subjects will not include the system roots"
 
 linters:
   enable:
@@ -32,3 +36,6 @@ linters-settings:
     rules:
       - name: unused-parameter
         disabled: true
+  gosec:
+    excludes:
+      - G115 # "Potential integer overflow when converting between integer types"; TODO re-enable eventually
diff --git a/.spire-tool-versions b/.spire-tool-versions
index 97d5b48257..99d2a5f91a 100644
--- a/.spire-tool-versions
+++ b/.spire-tool-versions
@@ -1,3 +1,3 @@
-golangci_lint v1.60.1
+golangci_lint v1.62.2
 markdown_lint v0.37.0
 protoc 24.4
diff --git a/Makefile b/Makefile
index e55192fdfb..08c00d9299 100644
--- a/Makefile
+++ b/Makefile
@@ -403,7 +403,7 @@ endif
 lint: lint-code lint-md
 
 lint-code: $(golangci_lint_bin)
-	$(E)PATH="$(go_bin_dir):$(PATH)" GOLANGCI_LINT_CACHE="$(golangci_lint_cache)" $(golangci_lint_bin) run ./...
+	$(E)PATH="$(go_bin_dir):$(PATH)" GOLANGCI_LINT_CACHE="$(golangci_lint_cache)" $(golangci_lint_bin) run --max-issues-per-linter=0 --max-same-issues=0 ./...
 
 lint-md:
 	$(E)docker run --rm -v "$(DIR):/workdir" $(markdown_lint_image) "**/*.md"