diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 0ba1806..e23ade6 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -18,11 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - id: goversion
-        run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT"
       - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
-          go-version: ${{ steps.goversion.outputs.goversion }}
+          go-version-file: .go-version
       - name: golangci-lint
         uses: golangci/golangci-lint-action@2e788936b09dd82dc280e845628a40d2ba6b204c # v6.3.1
         with:
diff --git a/.golangci.yaml b/.golangci.yaml
index 4762737..af38100 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,17 +1,14 @@
 ---
-run:
-  timeout: 30m
-  skip-files:
-    - "^zz_generated.*"
-
 issues:
-  max-same-issues: 0
+  exclude-files:
+    - "^zz_generated.*"
   # Excluding configuration per-path, per-linter, per-text and per-source
   exclude-rules:
     # exclude ineffassing linter for generated files for conversion
     - path: conversion\.go
       linters:
         - ineffassign
+  max-same-issues: 0
 
 linters:
   disable-all: true
@@ -21,6 +18,7 @@ linters:
   # - deadcode
   # - structcheck
   # - varcheck
+    - gofmt
     - goimports
     - ineffassign
     - nakedret
@@ -39,3 +37,6 @@ linters-settings: # please keep this alphabetized
   stylecheck:
     checks:
       - "ST1019"  # Importing the same package multiple times.
+
+run:
+  timeout: 30m