diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml
index c447ee3e7..b0a2065f9 100644
--- a/.github/workflows/lint-go.yml
+++ b/.github/workflows/lint-go.yml
@@ -1,8 +1,9 @@
 name: golangci-lint
+
+# Long living branches and all PRs
 on:
   push:
     branches:
-      - master
       - main
   pull_request:
 
@@ -19,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21.4'
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.6.0
@@ -27,7 +28,7 @@ jobs:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.53
+          version: v1.55.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir