diff --git a/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile
index caec62146d2d3..9b6b537e82353 100644
--- a/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile
+++ b/ci/cloudbuild/dockerfiles/fedora-cmake-quickstart.Dockerfile
@@ -177,12 +177,16 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
     cmake --build cmake-out --target install && \
     ldconfig && cd /var/tmp && rm -fr build
 
-# Use older version of gRPC that has demonstrated to encounter the gRPC+OpenSSL
-# double free issue in order to reduce flakes.
 WORKDIR /var/tmp/build/grpc
 RUN dnf makecache && dnf install -y c-ares-devel re2-devel
-RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.71.2.tar.gz | \
+RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.84.0.tar.gz | \
     tar -xzf - --strip-components=1 && \
+    mkdir -p third_party/grpc-proto && \
+    curl -fsSL https://github.com/grpc/grpc-proto/archive/ec30f589e2519d595688b9a42f88a91bdd6b733f.tar.gz | \
+    tar -xzf - -C third_party/grpc-proto --strip-components=1 && \
+    mkdir -p third_party/boringssl-with-bazel && \
+    curl -fsSL https://github.com/google/boringssl/archive/2b44a3701a4788e1ef866ddc7f143060a3d196c9.tar.gz | \
+    tar -xzf - -C third_party/boringssl-with-bazel --strip-components=1 && \
     cmake \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_CXX_STANDARD=17 \
@@ -194,7 +198,7 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.71.2.tar.gz | \
       -DgRPC_PROTOBUF_PROVIDER=package \
       -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG \
       -DgRPC_RE2_PROVIDER=package \
-      -DgRPC_SSL_PROVIDER=package \
+      -DgRPC_SSL_PROVIDER=module \
       -DgRPC_ZLIB_PROVIDER=package \
       -DgRPC_OPENTELEMETRY_PROVIDER=package \
       -DgRPC_BUILD_GRPCPP_OTEL_PLUGIN=ON \