diff --git a/.golangci.yml b/.golangci.yml
index 95fcec6e92..5aa6abd0e2 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,18 +1,8 @@
 run:
-  # timeout for analysis
-  deadline: 10m
+  go: "1.22.6"
 
-  # Skip autogenerated files for mobile and gRPC as well as copied code for
-  # internal use.
-  skip-files:
-    - "mobile\\/.*generated\\.go"
-    - "\\.pb\\.go$"
-    - "\\.pb\\.gw\\.go$"
-    - "internal\\/musig2v040"
-
-  skip-dirs:
-    - channeldb/migration_01_to_11
-    - channeldb/migration/lnwire21
+  # timeout for analysis
+  timeout: 10m
 
   build-tags:
     - autopilotrpc
@@ -57,7 +47,6 @@ linters-settings:
       - G306 # Poor file permissions used when writing to a new file.
 
   staticcheck:
-    go: "1.22.6"
     checks: ["-SA1019"]
 
   lll:
@@ -219,6 +208,18 @@ issues:
   # Only show newly introduced problems.
   new-from-rev: 8c66353e4c02329abdacb5a8df29998035ec2e24
 
+  # Skip autogenerated files for mobile and gRPC as well as copied code for
+  # internal use.
+  exclude-files:
+    - "mobile\\/.*generated\\.go"
+    - "\\.pb\\.go$"
+    - "\\.pb\\.gw\\.go$"
+    - "internal\\/musig2v040"
+
+  exclude-dirs:
+    - channeldb/migration_01_to_11
+    - channeldb/migration/lnwire21
+
   exclude-rules:
     # Exclude gosec from running for tests so that tests with weak randomness
     # (math/rand) will pass the linter.