diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ddc074b05..0efde78c0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,6 +98,11 @@ jobs:
         with:
           go-version-file: 'go.mod'
 
+      - name: Run Go Linter
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.58.2
+
       - name: Run Go tests
         working-directory: ${{ github.workspace }}
         run: go test ./...
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index f93abb776..44552e9ec 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -29,9 +29,9 @@ jobs:
           go-version-file: "go.mod"
 
       - name: Run Go Linter
-        uses: golangci/golangci-lint-action@v5
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.54.2
+          version: v1.58.2
 
       - name: Lint Markdown docs
         uses: DavidAnson/markdownlint-cli2-action@v16
diff --git a/.golangci.yml b/.golangci.yml
index c3c08b0ca..07203d296 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,13 +4,13 @@ linters:
     - goconst
     - godox
     - gofmt
-    - gomnd
     - lll
+    - mnd
     - misspell
 linters-settings:
   lll:
     line-length: 100
     tab-width: 4
-  gomnd:
+  mnd:
     ignored-functions:
       - "^make"