diff --git a/.bazelversion b/.bazelversion
index dfda3e0b4..f22d756da 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.1.0
+6.5.0
diff --git a/.gitignore b/.gitignore
index 9d3080155..8a88bf985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ src/go/proto/
 .clwb/
 .ijwb/
 .idea/
+.vscode/
 
 # C++ coverage
 generated/
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 22feec953..85b684207 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -59,7 +59,7 @@ For example: ***gcr.io/cloudesf-testing/gcpproxy-prow:v20240727-v2.46.0-27-g6c21
 Run the following command by replacing the **latest_image_link** with the link found above.
 
 ```
-docker run -ti --privileged -v /var/run/docker.sock:/var/run/docker.sock -v ~/esp-v2:/esp-v2 ${latest_image_link}  /bin/bash
+docker run -ti -v /var/run/docker.sock:/var/run/docker.sock -v ~/esp-v2:/esp-v2 ${latest_image_link}  /bin/bash
 ```
 
 #### Change Directory to `esp-v2`
@@ -191,7 +191,7 @@ make test-envoy
 To run integration tests:
 
 ```
-make integration-test-run-parallel
+make integration-test
 ```
 
 #### Enable IDE Integration
diff --git a/WORKSPACE b/WORKSPACE
index 4189aa289..52877d452 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -39,8 +39,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # 3) Check if envoy_build_config/extensions_build_config.bzl is up-to-date.
 # Try to match it with the one in source/extensions and comment out unneeded extensions.
 
-ENVOY_SHA1 = "349011c2ebd40f070510e34f4605bff1da64fb0e"  # v1.30.7
-ENVOY_SHA256 = "fee4d8c1005cac9a241e29d51a903b1b369515a8a77e5b7fe320520ae7c7b855"
+ENVOY_SHA1 = "63c6a8f4f1e12389ffd94f1ace83cd714ac8e9c3"  # v1.30.11
+
+ENVOY_SHA256 = "20e4dd8049aef9e89b8dbba721686d3ee7e56a983e8767416b648f0ea63ff4d9"
 
 http_archive(
     name = "envoy",
diff --git a/src/api_proxy/service_control/request_builder.cc b/src/api_proxy/service_control/request_builder.cc
index 4ce5ecf5a..eba46f119 100644
--- a/src/api_proxy/service_control/request_builder.cc
+++ b/src/api_proxy/service_control/request_builder.cc
@@ -387,8 +387,9 @@ Status set_credential_id(const SupportedLabel& l, const ReportRequestInfo& info,
       if (info.check_response_info.error.is_network_error) {
         (*labels)[l.name] = absl::StrCat(kApiKeyPrefix, "UNKNOWN");
       } else {
-        (*labels)[l.name] = info.check_response_info.api_key_uid.empty() ? absl::StrCat(kApiKeyPrefix,  info.api_key)
-                      : info.check_response_info.api_key_uid;
+        (*labels)[l.name] = info.check_response_info.api_key_uid.empty()
+                                ? absl::StrCat(kApiKeyPrefix, info.api_key)
+                                : info.check_response_info.api_key_uid;
       }
     } else {
       (*labels)[l.name] = absl::StrCat(kApiKeyPrefix, info.api_key);
diff --git a/src/api_proxy/service_control/request_builder_test.cc b/src/api_proxy/service_control/request_builder_test.cc
index 669af9841..b013b5cc4 100644
--- a/src/api_proxy/service_control/request_builder_test.cc
+++ b/src/api_proxy/service_control/request_builder_test.cc
@@ -460,7 +460,7 @@ TEST_F(RequestBuilderTest, ReportApiKeyVerifiedWithApiKeyUIDUnknownTest) {
   info.check_response_info.api_key_uid = "fake_api_key_uid";
   info.enable_api_key_uid_reporting = true;
   info.check_response_info.error = {"UNREACHABLE", true,
-                               ScResponseErrorType::CONSUMER_QUOTA};
+                                    ScResponseErrorType::CONSUMER_QUOTA};
 
   gasv1::ReportRequest request;
   ASSERT_TRUE(scp_.FillReportRequest(info, &request).ok());
@@ -506,7 +506,6 @@ TEST_F(RequestBuilderTest, ReportApiKeyVerifiedNotReportApiKeyUIDTest) {
   ASSERT_EQ(fields.at("api_key").string_value(), "api_key_x");
 }
 
-
 TEST_F(RequestBuilderTest, ReportApiKeyNotVerifiedTest) {
   ReportRequestInfo info;
   FillOperationInfo(&info);
diff --git a/src/envoy/http/service_control/filter_fuzz_test.cc b/src/envoy/http/service_control/filter_fuzz_test.cc
index 90842d860..6a13e1703 100644
--- a/src/envoy/http/service_control/filter_fuzz_test.cc
+++ b/src/envoy/http/service_control/filter_fuzz_test.cc
@@ -155,7 +155,7 @@ DEFINE_PROTO_FUZZER(
     stream_info->route_ = mock_route;
     EXPECT_CALL(*mock_route, mostSpecificPerFilterConfig(kFilterName))
         .WillRepeatedly(
-            Invoke([per_route](const std::string&)
+            Invoke([per_route](std::string_view)
                        -> const Envoy::Router::RouteSpecificFilterConfig* {
               return per_route.get();
             }));
diff --git a/src/envoy/token/token_subscriber.cc b/src/envoy/token/token_subscriber.cc
index fd1d396a6..06fdc24b3 100644
--- a/src/envoy/token/token_subscriber.cc
+++ b/src/envoy/token/token_subscriber.cc
@@ -120,7 +120,7 @@ void TokenSubscriber::refresh() {
     return;
   }
 
-  const struct Envoy::Http::AsyncClient::RequestOptions options =
+  const Envoy::Http::AsyncClient::RequestOptions options =
       Envoy::Http::AsyncClient::RequestOptions()
           .setTimeout(std::chrono::duration_cast<std::chrono::milliseconds>(
               fetch_timeout_))
diff --git a/tests/endpoints/grpc_echo/proto/api_descriptor.pb b/tests/endpoints/grpc_echo/proto/api_descriptor.pb
index 91bf058a4..29f4d3277 100644
Binary files a/tests/endpoints/grpc_echo/proto/api_descriptor.pb and b/tests/endpoints/grpc_echo/proto/api_descriptor.pb differ