diff --git a/WORKSPACE b/WORKSPACE
index 7b466fd3d8..ec48dbd462 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,6 +1,6 @@
 workspace(name = "envoy_mobile")
 
-# TODO[fz]: Remove once envoy updates PGV
+# The pgv imports require gazelle to be available early on.
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
     name = "bazel_gazelle",
diff --git a/bazel/envoy_mobile_repositories.bzl b/bazel/envoy_mobile_repositories.bzl
index b7e6799cdc..0fda43c24d 100644
--- a/bazel/envoy_mobile_repositories.bzl
+++ b/bazel/envoy_mobile_repositories.bzl
@@ -10,30 +10,12 @@ def envoy_mobile_repositories():
         urls = ["https://github.com/google/bazel-common/archive/413b433b91f26dbe39cdbc20f742ad6555dd1e27.zip"],
     )
 
-    # Uses PGV that includes the CC NOP template to disable validation.
-    # TODO(fz): Remove this once PGV is updated on envoy
-    override_pgv()
-
     upstream_envoy_overrides()
     swift_repos()
     kotlin_repos()
     android_repos()
     python_repos()
 
-def override_pgv():
-    go_repository(
-        name = "com_github_lyft_protoc_gen_star",
-        importpath = "github.com/lyft/protoc-gen-star",
-        sum = "h1:xOpFu4vwmIoUeUrRuAtdCrZZymT/6AkW/bsUWA506Fo=",
-        version = "v0.6.0",
-    )
-
-    git_repository(
-        name = "com_envoyproxy_protoc_gen_validate",
-        commit = "79071f0f8b04188b297a0517a6e55b2d3641ab5a",
-        remote = "https://github.com/envoyproxy/protoc-gen-validate"
-    )
-
 def upstream_envoy_overrides():
     # Workaround due to a Detekt version compatibility with protobuf: https://github.com/envoyproxy/envoy-mobile/issues/1869
     http_archive(
diff --git a/envoy b/envoy
index 3267361ced..57a85315f4 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 3267361cedf936e219fb467bc84d62bea05b04e7
+Subproject commit 57a85315f4ff34a2931b2eeea275578bccf23dd3
diff --git a/library/common/http/client.h b/library/common/http/client.h
index e66c065628..f2a75998d8 100644
--- a/library/common/http/client.h
+++ b/library/common/http/client.h
@@ -228,7 +228,7 @@ class Client : public Logger::Loggable<Logger::Id::http> {
     // It only has an effect in explicit flow control mode, where when all buffers are drained,
     // on_send_window_available callbacks are called.
     void readDisable(bool disable) override;
-    uint32_t bufferLimit() override {
+    uint32_t bufferLimit() const override {
       // 1Mb
       return 1024000;
     }