diff --git a/sw/nic/gpuagent/Makefile b/sw/nic/gpuagent/Makefile
index 3ef0fd5a..a4b99d8c 100644
--- a/sw/nic/gpuagent/Makefile
+++ b/sw/nic/gpuagent/Makefile
@@ -176,7 +176,7 @@ $(TARGET)_gim: build-libs gogo-protos gen-protos $(OBJ_GIM)
 .PHONY: mod
 mod:
 	@go mod tidy
-	@go mod edit -go=1.25.12
+	@go mod edit -go=1.25.13
 	#CVE-2024-24790 - gpuctl
 	@go mod edit -replace golang.org/x/net@v0.30.0=golang.org/x/net@v0.38.0
 	#CVE-2026-33186,GHSA-hrxh-6v49-42gf
diff --git a/sw/nic/gpuagent/go.mod b/sw/nic/gpuagent/go.mod
index a4fa5a7b..eff0b466 100644
--- a/sw/nic/gpuagent/go.mod
+++ b/sw/nic/gpuagent/go.mod
@@ -1,6 +1,6 @@
 module github.com/ROCm/gpu-agent/sw/nic/gpuagent
 
-go 1.25.12
+go 1.25.13
 
 require (
 	github.com/gogo/protobuf v1.3.2
diff --git a/tools/build-container/Dokerfile.rhel9 b/tools/build-container/Dokerfile.rhel9
index 3258d995..df43eb65 100644
--- a/tools/build-container/Dokerfile.rhel9
+++ b/tools/build-container/Dokerfile.rhel9
@@ -28,9 +28,9 @@ RUN dnf install -y --allowerasing \
 
 RUN yum install -y sudo
 
-RUN wget https://go.dev/dl/go1.25.12.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.25.12.linux-amd64.tar.gz && \
-    rm -f go1.25.12.linux-amd64.tar.gz
+RUN wget https://go.dev/dl/go1.25.13.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.25.13.linux-amd64.tar.gz && \
+    rm -f go1.25.13.linux-amd64.tar.gz
 
 ENV PATH=$PATH:/usr/local/go/bin:/root/go/bin
 ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
diff --git a/tools/build-container/Dokerfile.ubu2204 b/tools/build-container/Dokerfile.ubu2204
index 6367964a..d1e486d8 100644
--- a/tools/build-container/Dokerfile.ubu2204
+++ b/tools/build-container/Dokerfile.ubu2204
@@ -30,9 +30,9 @@ RUN apt-get update && apt-get install -y \
 
 WORKDIR /usr/src/github.com/Rocm/gpu-agent/
 
-RUN wget https://go.dev/dl/go1.25.12.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.25.12.linux-amd64.tar.gz && \
-    rm -f go1.25.12.linux-amd64.tar.gz
+RUN wget https://go.dev/dl/go1.25.13.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.25.13.linux-amd64.tar.gz && \
+    rm -f go1.25.13.linux-amd64.tar.gz
 
 ADD ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh