diff --git a/.github/workflows/ci-pr-checks.yaml b/.github/workflows/ci-pr-checks.yaml
index 7505a983aa..ccbdf1e05b 100644
--- a/.github/workflows/ci-pr-checks.yaml
+++ b/.github/workflows/ci-pr-checks.yaml
@@ -73,6 +73,7 @@ jobs:
         with:
           version: "v2.1.6"
           args: "--config=./.golangci.yml"
+          skip-cache: true
         env:
           CGO_ENABLED: ${{ env.CGO_ENABLED }}
           CGO_CFLAGS: ${{ env.CGO_CFLAGS }}
diff --git a/.golangci.yml b/.golangci.yml
index bc928c25b1..419281dbfa 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -11,23 +11,54 @@ formatters:
 
 linters:
   enable:
+  - bodyclose
   - copyloopvar
   - dupword
   - durationcheck
+  - errcheck
   - fatcontext
   - ginkgolinter
+  - goconst
   - gocritic
   - govet
+  - ineffassign
   - loggercheck
-  - misspell
-  - perfsprint
-  - revive
-  - unconvert
   - makezero
-  - errcheck
-  - goconst
-  - ineffassign
+  - misspell
   - nakedret
+  - nilnil
+  - perfsprint
   - prealloc
+  - revive
+  - staticcheck
   - unparam
   - unused
+  - unconvert
+  settings:
+    revive: # see https://github.com/mgechev/revive#available-rules for all options
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: exported
+        - name: if-return
+        - name: increment-decrement
+        - name: var-naming
+        - name: var-declaration
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: indent-error-flow
+        - name: errorf
+
+issues:
+  # do not limit the number of issues, ensure even identical are reported
+  max-issues-per-linter: 0
+  max-same-issues: 0
+  new: true # run on new code only