diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f979227d88..24f0078e48 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -50,7 +50,7 @@ jobs:
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           working-directory: ${{ matrix.directory }}
-          version: v2.4.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.5.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   njs-lint:
     name: NJS Lint
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fc4ba31b4a..75f756d0df 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,7 +39,7 @@ repos:
           - javascript
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.4.0
+    rev: v2.5.0
     hooks:
       - id: golangci-lint-full
         name: golangci-lint-root
diff --git a/Makefile b/Makefile
index c794b3a9e2..0a0154c07c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
 
 # tools versions
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION = v2.4.0
+GOLANGCI_LINT_VERSION = v2.5.0
 # renovate: datasource=docker depName=kindest/node
 KIND_K8S_VERSION = v1.34.0
 # renovate: datasource=github-tags depName=norwoodj/helm-docs
diff --git a/cmd/gateway/commands.go b/cmd/gateway/commands.go
index f334d499a7..4cb67bf3ec 100644
--- a/cmd/gateway/commands.go
+++ b/cmd/gateway/commands.go
@@ -776,7 +776,7 @@ func getBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
 
 	info, ok := debug.ReadBuildInfo()
 	if !ok {
-		return
+		return commitHash, commitTime, dirtyBuild
 	}
 	for _, kv := range info.Settings {
 		switch kv.Key {
@@ -789,7 +789,7 @@ func getBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
 		}
 	}
 
-	return
+	return commitHash, commitTime, dirtyBuild
 }
 
 func createGatewayPodConfig(version, svcName string) (config.GatewayPodConfig, error) {
diff --git a/tests/framework/info.go b/tests/framework/info.go
index 8f36929bc5..95c655377e 100644
--- a/tests/framework/info.go
+++ b/tests/framework/info.go
@@ -66,7 +66,7 @@ func GetBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
 
 	info, ok := debug.ReadBuildInfo()
 	if !ok {
-		return
+		return commitHash, commitTime, dirtyBuild
 	}
 
 	for _, kv := range info.Settings {
@@ -80,7 +80,7 @@ func GetBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
 		}
 	}
 
-	return
+	return commitHash, commitTime, dirtyBuild
 }
 
 // AddNginxLogsAndEventsToReport adds nginx logs and events from the namespace to the report if the spec failed.