diff --git a/cli/command/formatter/tabwriter/tabwriter.go b/cli/command/formatter/tabwriter/tabwriter.go
index a03d94ab6..e7473cd9b 100644
--- a/cli/command/formatter/tabwriter/tabwriter.go
+++ b/cli/command/formatter/tabwriter/tabwriter.go
@@ -12,7 +12,7 @@
 
 // based on https://github.com/golang/go/blob/master/src/text/tabwriter/tabwriter.go Last modified 690ac40 on 31 Jan
 
-//nolint:gocyclo,gofumpt,nakedret,unused // ignore linting errors, so that we can stick close to upstream
+//nolint:gocyclo,nakedret,unused // ignore linting errors, so that we can stick close to upstream
 package tabwriter
 
 import (
diff --git a/cli/connhelper/ssh/ssh.go b/cli/connhelper/ssh/ssh.go
index 2fcb54a98..34ae267e2 100644
--- a/cli/connhelper/ssh/ssh.go
+++ b/cli/connhelper/ssh/ssh.go
@@ -175,7 +175,7 @@ func quoteCommand(commandAndArgs ...string) (string, error) {
 			quotedCmd = a
 			continue
 		}
-		quotedCmd += " " + a
+		quotedCmd += " " + a //nolint:perfsprint // ignore "concat-loop"; no need to use a string-builder for this.
 	}
 	// each part is quoted appropriately, so now we'll have a full
 	// shell command to pass off to "ssh"
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index 6418f283f..a06dd22a3 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -7,7 +7,7 @@ ARG GO_VERSION=1.25.3
 # that's also available as alpine image variant for the Golang version used.
 ARG ALPINE_VERSION=3.22
 # GOLANGCI_LINT_VERSION sets the version of the golangci/golangci-lint image to use.
-ARG GOLANGCI_LINT_VERSION=v2.5.0
+ARG GOLANGCI_LINT_VERSION=v2.6.1
 
 FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint