diff --git a/.golangci.yml b/.golangci.yml
index 37c5580b..d4e067bb 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -107,10 +107,12 @@ linters:
     - bodyclose
     - deadcode
     - depguard
+    - dogsled
     - dupl
     - errcheck
     - exhaustive
     - exportloopref
+    - funlen
     - gochecknoinits
     - gochecknoglobals
     - gocognit
@@ -120,6 +122,7 @@ linters:
     - godot
     - goerr113
     - goheader
+    - goimports
     - golint
     - gomodguard
     - gomnd
@@ -133,6 +136,7 @@ linters:
     - maligned
     - misspell
     - nakedret
+    - nestif
     - noctx
     - nolintlint
     - prealloc
@@ -149,18 +153,14 @@ linters:
     - whitespace
     # run manually using cli:
     # - gci # breaks with blank named imports
+    # - godox # flags todo/bug/fixme
     # - unused # some false positives
     # don't enable:
-    # - dogsled
-    # - funlen
-    # - godox # flags todo/bug/fixme
     # - gofmt # conflicts with Go Language Server
     # - gofumpt # conflicts with Go Language Server
-    # - goimports
-    # - nestif
-    # - nlreturn
-    # - testpackage
-    # - wsl
+    # - nlreturn # excessive formatting
+    # - testpackage # requires major refactor of all tests
+    # - wsl # excessive formatting
 issues:
   max-same-issues: 0
   # Excluding configuration per-path, per-linter, per-text and per-source