diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 0092f5fab9..2a33c713b5 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -159,7 +159,6 @@ jobs:
         uses: golangci/golangci-lint-action@v4
         with:
           version: ${{ env.GOLANGCI_LINT_VERSION }}
-          args: --timeout 4m
 
       - name: Check go mod tidy has no pending changes
         run: |
diff --git a/.golangci.yml b/.golangci.yml
index ba83ff4d6f..5c468906f5 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -102,6 +102,7 @@ linters:
   # - varcheck
 
 run:
+  timeout: 5m
   skip-files: "zz_generated.*"
 
 issues: