diff --git a/.golangci.yml b/.golangci.yml
index c095e4519e..0e1bfb3f03 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,12 +2,6 @@
 run:
   concurrency: 6
   deadline: 5m
-  skip-dirs-use-default: true
-  skip-dirs:
-    - contrib
-    - dependencies
-  skip-files:
-    - swagger.go
   modules-download-mode: readonly
 linters:
   enable-all: true
@@ -97,3 +91,9 @@ issues:
   # Set to 0 to disable.
   # Default: 3
   max-same-issues: 0
+  exclude-dirs-use-default: true
+  exclude-dirs:
+    - contrib
+    - dependencies
+  exclude-files:
+    - swagger.go
diff --git a/hack/golangci-lint.sh b/hack/golangci-lint.sh
index 26e9831f90..35fdcde554 100755
--- a/hack/golangci-lint.sh
+++ b/hack/golangci-lint.sh
@@ -40,6 +40,6 @@ for to_lint in "${to_lint[@]}"; do
     # Make it really easy for a developer to copy-paste the command-line
     # to focus or debug a single, specific linting category.
     set -x
-    ./bin/golangci-lint run --timeout=10m --build-tags="${!tags_var}" --skip-dirs="${!skip_var}" "$@"
+    ./bin/golangci-lint run --timeout=10m --build-tags="${!tags_var}" --exclude-dirs="${!skip_var}" "$@"
   )
 done