diff --git a/tools/buildenv/CHANGES.txt b/tools/buildenv/CHANGES.txt
index 36b5b6b..f919b16 100644
--- a/tools/buildenv/CHANGES.txt
+++ b/tools/buildenv/CHANGES.txt
@@ -1,3 +1,6 @@
+v3.7.0
+ * Add system-installed protobuf and ASIO for C++ client testing
+
 v3.6.0
  * Update bazel to 9.1.1
 
diff --git a/tools/buildenv/Dockerfile b/tools/buildenv/Dockerfile
index 78fc426..d99121a 100644
--- a/tools/buildenv/Dockerfile
+++ b/tools/buildenv/Dockerfile
@@ -52,6 +52,29 @@ RUN apt-get update && \
     git clone https://github.com/bazelbuild/buildtools.git --depth 1 --branch v7.1.2 && \
     (cd buildtools/buildifier; GOBIN=/usr/local/bin go install)
 
+# Install ASIO
+RUN apt-get update && \
+    apt-get install -y libasio-dev && \
+    apt-get clean
+
+# Install Protobuf
+ARG PROTOBUF_VERSION=35.1
+RUN mkdir /protobuf && \
+    cd /protobuf && \
+    wget -O protobuf.tar.gz \
+      https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz && \
+    tar xf protobuf.tar.gz && \
+    cd protobuf-${PROTOBUF_VERSION} && \
+    cmake -S . -B build \
+      -DCMAKE_BUILD_TYPE=Release \
+      -Dprotobuf_BUILD_TESTS=OFF \
+      -DCMAKE_INSTALL_PREFIX=/usr/local && \
+    cmake --build build -j$(nproc) && \
+    cmake --install build && \
+    ldconfig && \
+    cd / && \
+    rm -rf /protobuf*
+
 WORKDIR /build
 
 # Add github actions user
diff --git a/tools/buildenv/VERSION.txt b/tools/buildenv/VERSION.txt
index 40c341b..7c69a55 100644
--- a/tools/buildenv/VERSION.txt
+++ b/tools/buildenv/VERSION.txt
@@ -1 +1 @@
-3.6.0
+3.7.0