diff --git a/.config/mise.toml b/.config/mise.toml
index 4be9f83..ec8e0aa 100644
--- a/.config/mise.toml
+++ b/.config/mise.toml
@@ -21,7 +21,7 @@ java = 'corretto-11'
 "github:pulumi/schema-tools" = "0.6.0"
 "go:github.com/pulumi/upgrade-provider" = "main"
 "aqua:gradle/gradle-distributions" = '7.6.6'
-golangci-lint = "1.64.8" # See note about about overrides if you need to customize this.
+golangci-lint = "2.2.2" # See note about about overrides if you need to customize this.
 "npm:yarn" = "1.22.22"
 
 [settings]
diff --git a/.golangci.yml b/.golangci.yml
index e46616d..89ff4cb 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,3 +1,5 @@
+# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt
+
 version: "2"
 linters:
   enable:
@@ -22,6 +24,11 @@ linters:
       - third_party$
       - builtin$
       - examples$
+    rules:
+      - linters:
+          - revive
+        path: pkg/version/
+        text: "var-naming" # https://github.com/pulumi/ci-mgmt/issues/2100
 formatters:
   enable:
     - gci
@@ -29,11 +36,11 @@ formatters:
   settings:
     gci:
       sections:
-        - standard
-        - blank
-        - default
-        - prefix(github.com/pulumi/)
-        - prefix(github.com/pulumi/pulumi-docker-build)
+        - standard # Standard section: captures all standard library packages.
+        - blank # Blank section: contains all blank imports.
+        - default # Default section: contains all imports that could not be matched to another section type.
+        - prefix(github.com/pulumi/) # Custom section: groups all imports with the github.com/pulumi/ prefix.
+        - prefix(github.com/pulumi/pulumi-docker-build) # Custom section: local imports
       custom-order: true
   exclusions:
     generated: lax