diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ea75a7d7c3..8356216b42 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,7 +15,6 @@ jobs:
   golangci:
     name: golangci-lint
     runs-on: ubuntu-latest
-    timeout-minutes: 6
     steps:
       - uses: actions/checkout@v4
       - uses: technote-space/get-diff-action@v6.1.2
@@ -29,12 +28,12 @@ jobs:
       - uses: actions/setup-go@v4
         if: env.GIT_DIFF
         with:
-          go-version: '1.20'
-      - uses: golangci/golangci-lint-action@v3.7.0
+          go-version: '1.21'
+      - uses: golangci/golangci-lint-action@v3
         if: env.GIT_DIFF
         with:
           # If you change this version, be sure to also change it in contrib/devtools/Makefile.
-          version: v1.54.2
+          version: v1.54
           args: --timeout 10m --out-${NO_FUTURE}format colored-line-number
           github-token: ${{ secrets.github_token }}
       - name: No Now Usage