diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 47877ee68..a091a29d5 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -53,7 +53,7 @@ jobs:
           sudo apt -qy install libseccomp-dev
       - uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
         with:
-          version: v2.12
+          version: v2.13
           skip-cache: true
       # Extra linters, only checking new code from a pull request to main.
       - name: lint-extra
diff --git a/.golangci.yml b/.golangci.yml
index 6fe213dfc..36a92fc42 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -9,7 +9,10 @@ formatters:
     - gofumpt
   settings:
     gofumpt:
-      extra-rules: true
+      extra:
+        balance-calls: true
+        clothe-returns: true
+        group-params: true
 
 linters:
   enable:
diff --git a/libcontainer/specconv/spec_linux_test.go b/libcontainer/specconv/spec_linux_test.go
index 3e532d490..4578f0115 100644
--- a/libcontainer/specconv/spec_linux_test.go
+++ b/libcontainer/specconv/spec_linux_test.go
@@ -32,7 +32,7 @@ func TestCreateCommandHookTimeout(t *testing.T) {
 func TestCreateHooks(t *testing.T) {
 	rspec := &specs.Spec{
 		Hooks: &specs.Hooks{
-			Prestart: []specs.Hook{
+			Prestart: []specs.Hook{ //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 				{
 					Path: "/some/hook/path",
 				},
@@ -364,7 +364,7 @@ func TestLinuxCgroupWithMemoryResource(t *testing.T) {
 			Limit:            &limit,
 			Reservation:      &reservation,
 			Swap:             &swap,
-			Kernel:           &kernel,
+			Kernel:           &kernel, //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
 			KernelTCP:        &kernelTCP,
 			Swappiness:       swappinessPtr,
 			DisableOOMKiller: &disableOOMKiller,