diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 75f2eb7..b0ce79d 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21
+          go-version: ^1.24
         id: go
 
       - name: Check out code into the Go module directory
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.21
+          go-version: ^1.24
         id: go
 
       - name: Check out code into the Go module directory
@@ -40,10 +40,10 @@ jobs:
         run: go install mvdan.cc/gofumpt@v0.4.0
 
       - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@v0.4.2
+        run: go install honnef.co/go/tools/cmd/staticcheck@v0.6.1
 
       - name: Install golangci-lint
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.0
+        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
 
       - name: Install NilAway
         run: go install go.uber.org/nilaway/cmd/nilaway@latest
diff --git a/.golangci.yaml b/.golangci.yaml
index e1e6a2e..185d64a 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -10,23 +10,21 @@ linters:
     - gocritic
     - godot
     - godox
-    - gomnd
     - lll
+    - mnd
     - nestif
     - nilnil
     - nlreturn
     - noctx
     - nonamedreturns
-    - nosnakecase
     - paralleltest
     - revive
     - testpackage
+    - tenv
     - unparam
     - varnamelen
     - wrapcheck
     - wsl
-    - deadcode
-    - varcheck
     - exhaustruct
     - depguard
 
@@ -36,19 +34,8 @@ linters:
     - contextcheck
     - rowserrcheck
     - sqlclosecheck
-    - structcheck
     - wastedassign
 
-    #
-    # Disabled because deprecated:
-    #
-    - exhaustivestruct
-    - golint
-    - ifshort
-    - interfacer
-    - maligned
-    - scopelint
-
 linters-settings:
   #
   # The G108 rule throws a false positive. We're not actually vulnerable. If
diff --git a/cmd/httpserver/main.go b/cmd/httpserver/main.go
index b46b5d8..dcd421f 100644
--- a/cmd/httpserver/main.go
+++ b/cmd/httpserver/main.go
@@ -10,7 +10,7 @@ import (
 	"github.com/flashbots/ssh-pubkey-server/common"
 	"github.com/flashbots/ssh-pubkey-server/httpserver"
 	"github.com/google/uuid"
-	"github.com/urfave/cli/v2" // imports as package "cli"
+	cli "github.com/urfave/cli/v2"
 )
 
 var flags []cli.Flag = []cli.Flag{
diff --git a/httpserver/server.go b/httpserver/server.go
index 6af944a..d181448 100644
--- a/httpserver/server.go
+++ b/httpserver/server.go
@@ -12,7 +12,7 @@ import (
 	"github.com/flashbots/go-utils/httplogger"
 	"github.com/flashbots/ssh-pubkey-server/common"
 	"github.com/flashbots/ssh-pubkey-server/metrics"
-	"github.com/go-chi/chi/v5"
+	chi "github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"go.uber.org/atomic"
 )