diff --git a/.golangci.yml b/.golangci.yml
index 22ca464..08bfb83 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,14 +3,30 @@ version: "2"
 run:
   timeout: 5m
 
-formatters:
-  enable:
-    - gofmt
-    - goimports
-  
-exclusions:
+  exclusions:
   generated: lax
+  presets:
+    - comments
+    - common-false-positives
+    - std-error-handling
   paths:
     - third_party$
     - builtin$
     - examples$
+  
+formatters:
+  enable:
+    - gofmt
+    - goimports
+
+  settings:
+    goimports:
+      local-prefixes:
+        - crm2
+
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/brewkit/images.libsonnet b/brewkit/images.libsonnet
index 81dc9ae..142f16a 100644
--- a/brewkit/images.libsonnet
+++ b/brewkit/images.libsonnet
@@ -1,4 +1,4 @@
 {
-    gobuilder: "mirror.gcr.io/golang:1.25-alpine",
-    golangcilint: "mirror.gcr.io/golangci/golangci-lint:v2.4-alpine",
+    gobuilder: "golang:1.25-alpine",
+    golangcilint: "golangci/golangci-lint:v2.4-alpine",
 }