diff --git a/sw/nic/gpuagent/go.mod b/sw/nic/gpuagent/go.mod
index 9c5789b..b020d71 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.24.6
+go 1.25.5
 
 require (
 	github.com/gogo/protobuf v1.3.2
diff --git a/tools/build-container/Dokerfile.rhel9 b/tools/build-container/Dokerfile.rhel9
index 37fe058..630230a 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.24.6.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.24.6.linux-amd64.tar.gz && \
-    rm -f go1.24.6.linux-amd64.tar.gz
+RUN wget https://go.dev/dl/go1.25.5.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.25.5.linux-amd64.tar.gz && \
+    rm -f go1.25.5.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 93b6b83..3fc1239 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.24.6.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.24.6.linux-amd64.tar.gz && \
-    rm -f go1.24.6.linux-amd64.tar.gz
+RUN wget https://go.dev/dl/go1.25.5.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.25.5.linux-amd64.tar.gz && \
+    rm -f go1.25.5.linux-amd64.tar.gz
 
 ADD ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh