diff --git a/.bazelversion b/.bazelversion
index 0b2eb36f50..ee74734aa2 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.7.2
+4.1.0
diff --git a/WORKSPACE b/WORKSPACE
index 9b90465440..31f37868e1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -38,10 +38,10 @@ bind(
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
 # Note: this is needed by release builder to resolve envoy dep sha to tag.
-# Commit date: 2021-05-13
-ENVOY_SHA = "2443032526cf6e50d63d35770df9473dd0460fc0"
+# Commit date: 2021-05-20
+ENVOY_SHA = "b6039234e526eeccdf332a7eb041729aaa1bc286"
 
-ENVOY_SHA256 = "4c3d6dcf09683742c5ae876154cbe3cf4fbfefa8b1cf1010e6bdca89ad5fd19c"
+ENVOY_SHA256 = "01b66c5adbed46ad813498e09051f48e1b9b6c18c2a5800cdbec897b132614c6"
 
 ENVOY_ORG = "envoyproxy"
 
diff --git a/extensions/access_log_policy/plugin.cc b/extensions/access_log_policy/plugin.cc
index a32a8e99f0..6b84d2c314 100644
--- a/extensions/access_log_policy/plugin.cc
+++ b/extensions/access_log_policy/plugin.cc
@@ -82,8 +82,9 @@ bool PluginRootContext::configure(size_t configuration_size) {
   auto configuration = configuration_data->toString();
   JsonParseOptions json_options;
   json_options.ignore_unknown_fields = true;
-  Status status = JsonStringToMessage(configuration, &config_, json_options);
-  if (status != Status::OK) {
+  const auto status =
+      JsonStringToMessage(configuration, &config_, json_options);
+  if (!status.ok()) {
     logWarn("Cannot parse AccessLog plugin configuration JSON string " +
             configuration + ", " + status.message().ToString());
     return false;
diff --git a/extensions/attributegen/plugin.cc b/extensions/attributegen/plugin.cc
index 50a8d39b33..cf56833f05 100644
--- a/extensions/attributegen/plugin.cc
+++ b/extensions/attributegen/plugin.cc
@@ -100,8 +100,8 @@ bool PluginRootContext::onConfigure(size_t configuration_size) {
   JsonParseOptions json_options;
   json_options.ignore_unknown_fields = true;
   istio::attributegen::PluginConfig config;
-  Status status = JsonStringToMessage(configuration, &config, json_options);
-  if (status != Status::OK) {
+  const auto status = JsonStringToMessage(configuration, &config, json_options);
+  if (!status.ok()) {
     LOG_WARN(
         absl::StrCat("Config Error: cannot parse 'attributegen' plugin "
                      "configuration JSON string [YAML is "
diff --git a/extensions/stackdriver/stackdriver.cc b/extensions/stackdriver/stackdriver.cc
index 8a2fb836ac..ec2c0a52c8 100644
--- a/extensions/stackdriver/stackdriver.cc
+++ b/extensions/stackdriver/stackdriver.cc
@@ -351,8 +351,9 @@ bool StackdriverRootContext::configure(size_t configuration_size) {
   // metadata. Parse configuration JSON string.
   JsonParseOptions json_options;
   json_options.ignore_unknown_fields = true;
-  Status status = JsonStringToMessage(configuration, &config_, json_options);
-  if (status != Status::OK) {
+  const auto status =
+      JsonStringToMessage(configuration, &config_, json_options);
+  if (!status.ok()) {
     logWarn("Cannot parse Stackdriver plugin configuration JSON string " +
             configuration + ", " + status.message().ToString());
     return false;
diff --git a/test/integration/exchanged_token_integration_test.cc b/test/integration/exchanged_token_integration_test.cc
index 4517f02f5f..3c93959c67 100644
--- a/test/integration/exchanged_token_integration_test.cc
+++ b/test/integration/exchanged_token_integration_test.cc
@@ -25,7 +25,6 @@
 #include "src/istio/utils/attribute_names.h"
 #include "test/integration/http_protocol_integration.h"
 
-using ::google::protobuf::util::error::Code;
 using ::testing::Contains;
 using ::testing::Not;
 
diff --git a/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc b/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc
index ae1b1333ae..f3a69dc074 100644
--- a/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc
+++ b/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc
@@ -27,7 +27,6 @@
 #include "src/istio/utils/attribute_names.h"
 #include "test/integration/http_protocol_integration.h"
 
-using ::google::protobuf::util::error::Code;
 using ::testing::Contains;
 using ::testing::Not;