diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index 6a8430ccef1..6d13bf632e6 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -128,7 +128,7 @@ ENV PATH="/usr/local/go/bin:$HOME/go/bin:$PATH"
 RUN GRPCURL_VERSION=v1.9.3 \
     && git clone --depth 1 --branch "${GRPCURL_VERSION}" https://github.com/fullstorydev/grpcurl.git /tmp/grpcurl \
     && cd /tmp/grpcurl \
-    && go get google.golang.org/grpc@v1.79.3 \
+    && go get google.golang.org/grpc@v1.82.1 \
     && go get github.com/go-jose/go-jose/v4@latest \
     && go get golang.org/x/crypto@latest golang.org/x/net@latest golang.org/x/text@latest golang.org/x/sys@latest golang.org/x/oauth2@latest \
     && go mod tidy \
@@ -428,16 +428,17 @@ RUN cd gnxi \
 # ENV PATH="$BACKUP_OF_PATH"
 
 # Build gnmic from source at a pinned upstream main commit. Picks up the
-# dependency fixes merged after v0.45.0 (grpc 1.79.3, otel-sdk 1.43.0,
+# dependency fixes merged after v0.45.0 (otel-sdk 1.43.0,
 # go-git 5.19.0, prometheus 0.311.3, etc.) that address the CVEs which
-# forced removal in #27059. The golang.org/x/* modules are additionally
-# upgraded to latest to clear current/future golang.org/x/* CVEs (the
-# pinned commit still locks older x/crypto, x/net, etc.). Temporary until
-# the next tagged gnmic release ships.
+# forced removal in #27059. grpc and the golang.org/x/* modules are
+# additionally upgraded to patched versions to clear current CVEs (the
+# pinned commit still locks older grpc, x/crypto, x/net, etc.). Temporary
+# until the next tagged gnmic release ships.
 RUN GNMIC_REV=653dc5dd4ddcd3bd4197317875a10c1ce8b06653 \
     && git clone https://github.com/openconfig/gnmic.git /tmp/gnmic \
     && cd /tmp/gnmic \
     && git checkout "${GNMIC_REV}" \
+    && go get google.golang.org/grpc@v1.82.1 \
     && go get golang.org/x/crypto@latest golang.org/x/net@latest golang.org/x/text@latest golang.org/x/sys@latest golang.org/x/oauth2@latest \
     && go mod tidy \
     && go build -o /usr/local/bin/gnmic . \