diff --git a/.bazelversion b/.bazelversion
index ba8bc581b15..9f2e85218f6 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.0.0rc1
+6.0.0-pre.20220706.4
diff --git a/WORKSPACE b/WORKSPACE
index 311c0a5d752..e98120d6f5d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -35,10 +35,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: 2022-11-21
-ENVOY_SHA = "8a26244b2804a00820b2f6dd55ea69cb97bfa996"
+# Commit date: 2022-11-22
+ENVOY_SHA = "aa694434a64871c309cfc95a207bbb67494e6c2a"
 
-ENVOY_SHA256 = "297da30e3ec5f7fcb2ab8d8662df8f9cc217a91a9e81360c1dfa3a2440125f41"
+ENVOY_SHA256 = "5cb36b4097961423d8831b93ce794076b58ca7ede8aa234080dd18f59ee9bfab"
 
 ENVOY_ORG = "envoyproxy"
 
diff --git a/envoy.bazelrc b/envoy.bazelrc
index 723b5cd4fe0..eea01acb621 100644
--- a/envoy.bazelrc
+++ b/envoy.bazelrc
@@ -377,7 +377,6 @@ build:windows --define tcmalloc=disabled
 build:windows --define wasm=disabled
 build:windows --define manual_stamp=manual_stamp
 build:windows --cxxopt="/std:c++17"
-build:windows --output_groups=+pdb_file
 
 # TODO(wrowe,sunjayBhatia): Resolve bugs upstream in curl and rules_foreign_cc
 # See issue https://github.com/bazelbuild/rules_foreign_cc/issues/301