diff --git a/.bazelrc b/.bazelrc
index 95ca8c7ff..ccb74f69c 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -25,8 +25,8 @@ build --color=yes
 build --workspace_status_command="bash bazel/get_workspace_status"
 build --incompatible_strict_action_env
 build --host_force_python=PY3
-build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
-build --javabase=@bazel_tools//tools/jdk:remote_jdk11
+build --java_runtime_version=remotejdk_11
+build --tool_java_runtime_version=remotejdk_11
 build --enable_platform_specific_config
 
 # Allow tags to influence execution requirements
diff --git a/.bazelversion b/.bazelversion
index fae6e3d04..0062ac971 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-4.2.1
+5.0.0
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index ed05657ac..5a0b50264 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "aa29229b144ec9b59606e81f730eae143c9282a4"  # Jan 31, 2022
-ENVOY_SHA = "8e23ac6fa359565cccf4c4548057dcdf3e7be972a6c4710b6531a9413fd9c31d"
+ENVOY_COMMIT = "4a03e625960267032577f6792eef41d715b87b40"  # Feb 07, 2022
+ENVOY_SHA = "d4d09268c4619b07d5c405784f029fb591a76585c59e13a0f0c55254f748a571"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
diff --git a/include/nighthawk/common/factories.h b/include/nighthawk/common/factories.h
index c93097b79..bfa26decb 100644
--- a/include/nighthawk/common/factories.h
+++ b/include/nighthawk/common/factories.h
@@ -6,7 +6,6 @@
 #include "envoy/common/pure.h"
 #include "envoy/common/time.h"
 #include "envoy/event/dispatcher.h"
-#include "envoy/stats/symbol_table.h"
 #include "envoy/upstream/cluster_manager.h"
 
 #include "nighthawk/common/platform_util.h"
diff --git a/source/client/client_worker_impl.cc b/source/client/client_worker_impl.cc
index a02b160ac..3827de78c 100644
--- a/source/client/client_worker_impl.cc
+++ b/source/client/client_worker_impl.cc
@@ -1,6 +1,6 @@
 #include "source/client/client_worker_impl.h"
 
-#include "external/envoy/source/common/stats/symbol_table_impl.h"
+#include "external/envoy/source/common/stats/symbol_table.h"
 
 #include "source/common/cached_time_source_impl.h"
 #include "source/common/phase_impl.h"
diff --git a/source/client/flush_worker_impl.cc b/source/client/flush_worker_impl.cc
index 661afcc69..35d71b25a 100644
--- a/source/client/flush_worker_impl.cc
+++ b/source/client/flush_worker_impl.cc
@@ -1,6 +1,6 @@
 #include "source/client/flush_worker_impl.h"
 
-#include "external/envoy/source/common/stats/symbol_table_impl.h"
+#include "external/envoy/source/common/stats/symbol_table.h"
 #include "external/envoy/source/server/server.h"
 
 #include "source/common/utility.h"